Skip to content

Commit 2197025

Browse files
committed
Fix navbar cutoff on small screens and enforce Raleway for headers, Ubuntu for body text
1 parent 109d760 commit 2197025

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

src/design/Layouts/FullScreen.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const FullScreen = () => {
2626
borderBottom: `2px solid ${Colors.primary.dark}`,
2727
boxShadow: `0px 0px 10px ${Colors.lightGray}`,
2828
left: "0",
29-
height: "6rem",
29+
minHeight: "6rem",
3030
}}
3131
>
3232
<Toolbar sx={{ marginTop: "0.5rem" }}>
@@ -36,7 +36,7 @@ const FullScreen = () => {
3636
justifyContent={justifyContentValue}
3737
sx={{ maxWidth: "100%" }}
3838
>
39-
<Grid item sm={12} md={12} lg={5}>
39+
<Grid item sm={12} md={5} lg={5}>
4040
<Button
4141
sx={{
4242
display: "flex",
@@ -65,8 +65,13 @@ const FullScreen = () => {
6565
</Button>
6666
</Grid>
6767
{/* Navigation links*/}
68-
<Grid item>
69-
<Grid container spacing={3} justifyContent="flex-end">
68+
<Grid item paddingLeft="2rem">
69+
<Grid
70+
container
71+
spacing={3}
72+
justifyContent="center"
73+
// border="2px solid red"
74+
>
7075
{[
7176
{ text: "ABOUT", url: "https://neurojson.org/Doc/Start" },
7277
{ text: "WIKI", url: "https://neurojson.org/Wiki" },

src/design/theme.ts

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,37 +37,30 @@ export const Colors = {
3737

3838
const theme = createTheme({
3939
typography: {
40-
fontFamily: [
41-
"Raleway",
42-
"Ubuntu",
43-
'"IBM Plex Sans"',
44-
"-apple-system",
45-
"BlinkMacSystemFont",
46-
'"Segoe UI"',
47-
"Roboto",
48-
'"Helvetica Neue"',
49-
"Arial",
50-
"sans-serif",
51-
].join(","),
40+
fontFamily: ["Raleway", "Ubuntu"].join(","),
5241
h1: {
5342
fontFamily: "Raleway",
5443
fontWeight: 700,
55-
fontSize: "2rem",
44+
// fontSize: "2rem",
45+
fontSize: "2.5rem",
5646
textTransform: "none",
5747
},
5848
h2: {
5949
fontWeight: 600,
60-
fontSize: "1.75rem",
50+
// fontSize: "1.75rem",
51+
fontSize: "1.2rem",
6152
textTransform: "none",
6253
color: Colors.secondary.main,
6354
},
6455
body1: {
6556
fontSize: "1rem",
6657
color: Colors.textPrimary,
58+
fontFamily: "Ubuntu",
6759
},
6860
body2: {
6961
fontSize: "0.875rem",
7062
color: Colors.textSecondary,
63+
fontFamily: "Ubuntu",
7164
},
7265
},
7366
});

0 commit comments

Comments
 (0)