Skip to content

Commit fd0395b

Browse files
authored
fix: make sidebar (and content) fill the whole page (#2777)
1 parent 38dfb68 commit fd0395b

2 files changed

Lines changed: 52 additions & 47 deletions

File tree

src/library-authoring/import-course/CourseImportHomePage.tsx

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -55,53 +55,51 @@ export const CourseImportHomePage = () => {
5555
}
5656

5757
return (
58-
<div className="d-flex">
59-
<div className="flex-grow-1">
60-
<Helmet>
61-
<title>{libraryData.title} | {process.env.SITE_NAME}</title>
62-
</Helmet>
63-
<Header
64-
number={libraryData.slug}
65-
title={libraryData.title}
66-
org={libraryData.org}
67-
contextId={libraryId}
68-
isLibrary
69-
readOnly={readOnly}
70-
containerProps={{
71-
size: undefined,
72-
}}
73-
/>
74-
<Container className="mt-4 mb-5">
75-
<div className="px-4 bg-light-200 border-bottom">
76-
<SubHeader
77-
title={intl.formatMessage(messages.pageTitle)}
78-
subtitle={intl.formatMessage(messages.pageSubtitle)}
79-
hideBorder
80-
headerActions={<ImportCourseButton />}
81-
/>
82-
</div>
83-
<Layout xs={[{ span: 9 }, { span: 3 }]}>
84-
<Layout.Element>
85-
{courseImports.length ? (
86-
<Stack gap={3} className="pl-4 mt-4">
87-
<h3>
88-
<FormattedMessage {...messages.courseImportPreviousImports} />
89-
</h3>
90-
{courseImports.map((courseImport) => (
91-
<ImportedCourseCard
92-
key={courseImport.source.key}
93-
courseImport={courseImport}
94-
/>
95-
))}
96-
</Stack>
97-
) : (<EmptyState />)}
98-
</Layout.Element>
99-
<Layout.Element>
100-
<HelpSidebar />
101-
</Layout.Element>
102-
</Layout>
103-
</Container>
104-
</div>
58+
<div className="d-flex flex-column vh-100 course-import">
59+
<Helmet>
60+
<title>{libraryData.title} | {process.env.SITE_NAME}</title>
61+
</Helmet>
62+
<Header
63+
number={libraryData.slug}
64+
title={libraryData.title}
65+
org={libraryData.org}
66+
contextId={libraryId}
67+
isLibrary
68+
readOnly={readOnly}
69+
containerProps={{
70+
size: undefined,
71+
}}
72+
/>
73+
<Container className="mt-4 d-flex flex-column flex-grow-1">
74+
<div className="px-4 bg-light-200 border-bottom">
75+
<SubHeader
76+
title={intl.formatMessage(messages.pageTitle)}
77+
subtitle={intl.formatMessage(messages.pageSubtitle)}
78+
hideBorder
79+
headerActions={<ImportCourseButton />}
80+
/>
81+
</div>
82+
<Layout xs={[{ span: 9 }, { span: 3 }]}>
83+
<Layout.Element>
84+
{courseImports.length ? (
85+
<Stack gap={3} className="pl-4 mt-4">
86+
<h3>
87+
<FormattedMessage {...messages.courseImportPreviousImports} />
88+
</h3>
89+
{courseImports.map((courseImport) => (
90+
<ImportedCourseCard
91+
key={courseImport.source.key}
92+
courseImport={courseImport}
93+
/>
94+
))}
95+
</Stack>
96+
) : (<EmptyState />)}
97+
</Layout.Element>
98+
<Layout.Element>
99+
<HelpSidebar />
100+
</Layout.Element>
101+
</Layout>
102+
</Container>
105103
</div>
106104
);
107105
};

src/library-authoring/import-course/index.scss

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,10 @@
3636
padding-left: 0;
3737
}
3838
}
39+
40+
.course-import {
41+
.row {
42+
// Make the row grow to fill the remaining vertial space
43+
flex-grow: 1;
44+
}
45+
}

0 commit comments

Comments
 (0)