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

Support smaller screens better on index and data pages

parent 1697dbde
Branches
Tags
1 merge request!3Add some polish to various pages and update header / add a footer
Hide whitespace changes
Inline Side-by-side
webapp/src/pages/CompendiumData.tsx
+ 11
− 11
View file @ 50ce21dc
...@@ -8,39 +8,39 @@ import { Link } from "react-router-dom"; ...@@ -8,39 +8,39 @@ import { Link } from "react-router-dom";
function CompendiumData(): ReactElement { function CompendiumData(): ReactElement {
return ( return (
<main style={{ backgroundColor: "white" }}> <main className="content" style={{ backgroundColor: "white" }}>
<PageHeader type={'data'} header={'Compendium Data'}> <PageHeader type={'data'} header={'Compendium Data'}>
<SectionLink section={"Reports"} /> <SectionLink section={"Reports"} />
</PageHeader> </PageHeader>
<Banner type={'data'}> <Banner type={'data'}>
<p className="wordwrap"> <p className="wordwrap">
The GÉANT Compendium provides an authoritative reference source for anyone with an The GÉANT Compendium provides an authoritative reference source for anyone with an
interest in the development of research and education networking in Europe and beyond. interest in the development of research and education networking in Europe and beyond.
Published since 2001, the Compendium provides information on key areas such as users, Published since 2001, the Compendium provides information on key areas such as users,
services, traffic, budget and staffing. services, traffic, budget and staffing.
</p> </p>
</Banner> </Banner>
<Container className="geant-container"> <Container className="geant-container">
<Row> <Row>
<div className="center"> <div className="center">
<CollapsibleBox title="ORGANISATION"> <CollapsibleBox title="ORGANISATION">
<div className="collapsible-column"> <div className="collapsible-column">
<Row> <Row>
<Link to="/analysis" state={{ graph: 'budget' }}> <Link to="/analysis" className="link-text-underline" target="_blank">
<span>Budget of NRENs per Year</span> <span>Budget of NRENs per Year</span>
</Link> </Link>
</Row> </Row>
<Row> <Row>
<Link to="/funding" state={{ graph: 'fundingsources' }}> <Link to="/funding" className="link-text-underline" target="_blank">
<span>Income Source of NRENs per Year</span> <span>Income Source of NRENs per Year</span>
</Link> </Link>
</Row> </Row>
<Row> <Row>
<Link to="/charging" state={{ graph: 'charging_structure' }}> <Link to="/charging" className="link-text-underline" target="_blank">
<span>Charging Mechanism of NRENs per Year</span> <span>Charging Mechanism of NRENs per Year</span>
</Link> </Link>
</Row> </Row>
......
webapp/src/pages/Landing.tsx
+ 24
− 21
View file @ 50ce21dc
...@@ -11,16 +11,19 @@ function Landing(): ReactElement { ...@@ -11,16 +11,19 @@ function Landing(): ReactElement {
<div className="center-text max-width-100vw"> <div className="center-text max-width-100vw">
<h1 className="geant-header">THE GÉANT COMPENDIUM OF NRENS</h1> <h1 className="geant-header">THE GÉANT COMPENDIUM OF NRENS</h1>
<br /> <br />
<p className="wordwrap"> <div className="wordwrap">
The GÉANT Compendium provides an authoritative reference source for anyone with an <p>
interest in the development of research and education networking in Europe and beyond. The GÉANT Compendium provides an authoritative reference source for anyone with an
Published since 2001, the Compendium provides information on key areas such as users, interest in the development of research and education networking in Europe and beyond.
services, traffic, budget and staffing. Published since 2001, the Compendium provides information on key areas such as users,
</p> services, traffic, budget and staffing.
<p className="wordwrap"> </p>
This site captures the responses from the National Research and Education Networks <p>
themselves. This site captures the responses from the National Research and Education Networks
</p> themselves.
</p>
</div>
</div> </div>
</Row> </Row>
<Row> <Row>
...@@ -33,7 +36,7 @@ function Landing(): ReactElement { ...@@ -33,7 +36,7 @@ function Landing(): ReactElement {
<Col align={"center"}> <Col align={"center"}>
<Card border='light' style={{ width: "18rem" }}> <Card border='light' style={{ width: "18rem" }}>
<Link to="/data" style={{textDecoration:"none"}}> <Link to="/data" className="link-text" >
<Card.Img src={SectionDataLogo} /> <Card.Img src={SectionDataLogo} />
<Card.Body> <Card.Body>
<Card.Title>Compendium Data</Card.Title> <Card.Title>Compendium Data</Card.Title>
...@@ -48,16 +51,16 @@ function Landing(): ReactElement { ...@@ -48,16 +51,16 @@ function Landing(): ReactElement {
</Col> </Col>
<Col align={"center"}> <Col align={"center"}>
<Card border='light' style={{ width: "18rem" }}> <Card border='light' style={{ width: "18rem" }}>
<a href="https://resources.geant.org/geant-compendia/" style={{textDecoration:"none"}}> <a href="https://resources.geant.org/geant-compendia/" className="link-text" target="_blank">
<Card.Img src={SectionReportsLogo} /> <Card.Img src={SectionReportsLogo} />
<Card.Body> <Card.Body>
<Card.Title>Compendium Reports</Card.Title> <Card.Title>Compendium Reports</Card.Title>
<Card.Text> <Card.Text>
A GÉANT Compendium Report is published annually, drawing A GÉANT Compendium Report is published annually, drawing
on data from the Compendium Survey lled in by NRENs, on data from the Compendium Survey lled in by NRENs,
complemented by information from other surveys complemented by information from other surveys
</Card.Text> </Card.Text>
</Card.Body> </Card.Body>
</a> </a>
</Card> </Card>
</Col> </Col>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment