Skip to content
Snippets Groups Projects
Commit 4b379646 authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

use main on all pages to allow footer following the bottom of the page consistently

use common margins
parent da462e3e
No related branches found
No related tags found
No related merge requests found
...@@ -83,7 +83,9 @@ const GlobalLayout = () => { ...@@ -83,7 +83,9 @@ const GlobalLayout = () => {
<> <>
<Providers> <Providers>
<ExternalPageNavBar /> <ExternalPageNavBar />
{hasOutlet ? <Outlet /> : <Landing />} <main className="grow">
{hasOutlet ? <Outlet /> : <Landing />}
</main>
<PrivacyModal /> <PrivacyModal />
</Providers> </Providers>
<GeantFooter /> <GeantFooter />
......
...@@ -55,7 +55,7 @@ function DataPage({ title, description, filter, children, category, data, filena ...@@ -55,7 +55,7 @@ function DataPage({ title, description, filter, children, category, data, filena
<span>You are viewing a preview of the website which includes pre-published survey data. <a href={locationWithoutPreview}>Click here</a> to deactivate preview mode.</span> <span>You are viewing a preview of the website which includes pre-published survey data. <a href={locationWithoutPreview}>Click here</a> to deactivate preview mode.</span>
</Row>} </Row>}
<SectionNavigation activeCategory={category} /> <SectionNavigation activeCategory={category} />
<Container className="grow"> <Container className="mb-5 grow">
<Row> <Row>
<h3 className="m-1">{title}</h3> <h3 className="m-1">{title}</h3>
</Row> </Row>
......
...@@ -11,7 +11,6 @@ import useMatomo from "../matomo/UseMatomo"; ...@@ -11,7 +11,6 @@ import useMatomo from "../matomo/UseMatomo";
function CompendiumData(): ReactElement { function CompendiumData(): ReactElement {
usePreview(); usePreview();
const { trackPageView } = useMatomo() const { trackPageView } = useMatomo()
React.useEffect(() => { React.useEffect(() => {
...@@ -21,7 +20,7 @@ function CompendiumData(): ReactElement { ...@@ -21,7 +20,7 @@ function CompendiumData(): ReactElement {
}, [trackPageView]) }, [trackPageView])
return ( return (
<main className="grow"> <>
<PageHeader type={'data'} /> <PageHeader type={'data'} />
<Banner type={'data'}> <Banner type={'data'}>
<p className="wordwrap"> <p className="wordwrap">
...@@ -32,8 +31,9 @@ function CompendiumData(): ReactElement { ...@@ -32,8 +31,9 @@ function CompendiumData(): ReactElement {
</p> </p>
</Banner> </Banner>
<Container className="pt-5"> <Container className="mt-5 mb-5">
<CollapsibleBox title={Sections.Organisation}> <Row>
<CollapsibleBox title={Sections.Organisation}>
<h6 className="section-title">Budget, Income and Billing</h6> <h6 className="section-title">Budget, Income and Billing</h6>
<Link to="/budget" className="link-text-underline"> <Link to="/budget" className="link-text-underline">
<span>Budget of NRENs per Year</span> <span>Budget of NRENs per Year</span>
...@@ -67,9 +67,9 @@ function CompendiumData(): ReactElement { ...@@ -67,9 +67,9 @@ function CompendiumData(): ReactElement {
<Link to="/ec-projects" className="link-text-underline"> <Link to="/ec-projects" className="link-text-underline">
<span>NREN Involvement in European Commission Projects</span> <span>NREN Involvement in European Commission Projects</span>
</Link> </Link>
</CollapsibleBox> </CollapsibleBox>
<CollapsibleBox title={Sections.Policy} startCollapsed> <CollapsibleBox title={Sections.Policy} startCollapsed>
<Link to="/policy" className="link-text-underline"> <Link to="/policy" className="link-text-underline">
<span>NREN Policies</span> <span>NREN Policies</span>
</Link> </Link>
...@@ -104,9 +104,9 @@ function CompendiumData(): ReactElement { ...@@ -104,9 +104,9 @@ function CompendiumData(): ReactElement {
<Link to="/service-management-framework" className="link-text-underline"> <Link to="/service-management-framework" className="link-text-underline">
<span>NRENs Operating a Formal Service Management Framework</span> <span>NRENs Operating a Formal Service Management Framework</span>
</Link> </Link>
</CollapsibleBox> </CollapsibleBox>
<CollapsibleBox title={Sections.ConnectedUsers} startCollapsed> <CollapsibleBox title={Sections.ConnectedUsers} startCollapsed>
<h6 className="section-title">Connected Users</h6> <h6 className="section-title">Connected Users</h6>
<Link to="/institutions-urls" className="link-text-underline"> <Link to="/institutions-urls" className="link-text-underline">
<span>Webpages Listing Institutions and Organisations Connected to NREN Networks</span> <span>Webpages Listing Institutions and Organisations Connected to NREN Networks</span>
...@@ -138,8 +138,8 @@ function CompendiumData(): ReactElement { ...@@ -138,8 +138,8 @@ function CompendiumData(): ReactElement {
<Link to="/commercial-connectivity" className="link-text-underline"> <Link to="/commercial-connectivity" className="link-text-underline">
<span>Commercial Connectivity</span> <span>Commercial Connectivity</span>
</Link> </Link>
</CollapsibleBox> </CollapsibleBox>
<CollapsibleBox title={Sections.Network} startCollapsed> <CollapsibleBox title={Sections.Network} startCollapsed>
<h6 className="section-title" >Connectivity</h6> <h6 className="section-title" >Connectivity</h6>
<Link to="/traffic-volume" className="link-text-underline"> <Link to="/traffic-volume" className="link-text-underline">
<span>NREN Traffic - NREN Customers & External Networks</span> <span>NREN Traffic - NREN Customers & External Networks</span>
...@@ -221,8 +221,8 @@ function CompendiumData(): ReactElement { ...@@ -221,8 +221,8 @@ function CompendiumData(): ReactElement {
<Link to="/nfv" className="link-text-underline"> <Link to="/nfv" className="link-text-underline">
<span>Kinds of Network Function Virtualisation used by NRENs</span> <span>Kinds of Network Function Virtualisation used by NRENs</span>
</Link> </Link>
</CollapsibleBox> </CollapsibleBox>
<CollapsibleBox title={Sections.Services} startCollapsed> <CollapsibleBox title={Sections.Services} startCollapsed>
<Link to="/network-services" className="link-text-underline"> <Link to="/network-services" className="link-text-underline">
<span>Network services</span> <span>Network services</span>
</Link> </Link>
...@@ -247,9 +247,10 @@ function CompendiumData(): ReactElement { ...@@ -247,9 +247,10 @@ function CompendiumData(): ReactElement {
<Link to="/professional-services" className="link-text-underline"> <Link to="/professional-services" className="link-text-underline">
<span>Professional services</span> <span>Professional services</span>
</Link> </Link>
</CollapsibleBox> </CollapsibleBox>
</Row>
</Container> </Container>
</main> </>
); );
} }
......
...@@ -52,7 +52,6 @@ $year-colors: ( ...@@ -52,7 +52,6 @@ $year-colors: (
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
padding-bottom: 4%;
} }
.grey-container { .grey-container {
...@@ -124,6 +123,7 @@ $year-colors: ( ...@@ -124,6 +123,7 @@ $year-colors: (
opacity: 0; opacity: 0;
max-height: 0; max-height: 0;
visibility: hidden; visibility: hidden;
overflow: hidden;
} }
.collapsible-column { .collapsible-column {
...@@ -614,4 +614,28 @@ $funding-source-colors: ( ...@@ -614,4 +614,28 @@ $funding-source-colors: (
.bold-text { .bold-text {
font-weight: bold; font-weight: bold;
}
.user-management-table {
width: 100%;
table-layout: fixed;
max-height: max(50vh, 30rem);
}
@media (max-width: 1920px) {
.user-management-table {
max-width: 100vw;
}
}
.user-management-table>* th,
.user-management-table>* td {
word-wrap: break-word;
}
.user-management-table thead th {
position: sticky;
top: -.1rem;
background-color: white;
z-index: 1;
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment