aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEug-VS <eug-vs@keemail.me>2020-01-27 12:19:48 +0300
committerEug-VS <eug-vs@keemail.me>2020-01-27 12:19:48 +0300
commit8a75fef7a7b68f82b745f7d73cbafdfb1f444825 (patch)
treeded64ccb0a41ac6907a96519a420dffbb9994b15
parenta82bd36a02e2396817d64c466f001dcd84734bf1 (diff)
downloadreact-benzin-8a75fef7a7b68f82b745f7d73cbafdfb1f444825.tar.gz
feat: update components
-rw-r--r--src/lib/components/ContentSection/ContentSection.js5
-rw-r--r--src/lib/components/Header/Header.js8
-rw-r--r--src/lib/components/Window/Window.js2
-rw-r--r--src/lib/components/Window/WindowSurface/WindowSurface.js11
4 files changed, 14 insertions, 12 deletions
diff --git a/src/lib/components/ContentSection/ContentSection.js b/src/lib/components/ContentSection/ContentSection.js
index 5108ce0..461a9c2 100644
--- a/src/lib/components/ContentSection/ContentSection.js
+++ b/src/lib/components/ContentSection/ContentSection.js
@@ -12,13 +12,8 @@ const useStyles = makeStyles(theme => ({
padding: theme.spacing(0, 2, 1, 2),
marginBottom: theme.spacing(1),
- '& a': {
- color: theme.palette.secondary.light,
- },
'& .MuiButton-root': {
- color: theme.palette.background.paper,
margin: theme.spacing(1, 2, 2, 0),
- fontWeight: 'bold',
},
},
}));
diff --git a/src/lib/components/Header/Header.js b/src/lib/components/Header/Header.js
index 1595141..fddf8b3 100644
--- a/src/lib/components/Header/Header.js
+++ b/src/lib/components/Header/Header.js
@@ -16,9 +16,13 @@ import GitHubIcon from '@material-ui/icons/GitHub';
const useStyles = makeStyles(theme => ({
+ root: {
+ background: theme.palette.background.elevation2,
+ color: theme.palette.text.primary,
+ },
logo: {
- color: theme.palette.secondary.main,
margin: theme.spacing(0, 3, 0, 3),
+ color: theme.palette.primary.main,
},
tab: {
'& .MuiTab-wrapper': {
@@ -48,7 +52,7 @@ const Header = ({ page, setPage }) => {
};
return (
- <AppBar position="sticky">
+ <AppBar position="sticky" className={classes.root}>
<Toolbar>
<Typography variant="h4" className={classes.logo}>
ChronoCube
diff --git a/src/lib/components/Window/Window.js b/src/lib/components/Window/Window.js
index 0ba2454..027213f 100644
--- a/src/lib/components/Window/Window.js
+++ b/src/lib/components/Window/Window.js
@@ -8,7 +8,7 @@ import WindowSurface from './WindowSurface/WindowSurface';
const useStyles = makeStyles(theme => ({
header: {
padding: theme.spacing(1, 0, 1, 2),
- background: theme.palette.background.elevation,
+ background: theme.palette.background.elevation2,
},
}));
diff --git a/src/lib/components/Window/WindowSurface/WindowSurface.js b/src/lib/components/Window/WindowSurface/WindowSurface.js
index 26fea01..7859bf6 100644
--- a/src/lib/components/Window/WindowSurface/WindowSurface.js
+++ b/src/lib/components/Window/WindowSurface/WindowSurface.js
@@ -8,9 +8,12 @@ const useStyles = makeStyles(theme => ({
position: 'absolute',
display: 'flex',
flexDirection: 'column',
- background: theme.palette.background.elevation,
overflowY: 'auto',
- scrollbarColor: `${theme.palette.primary.dark} ${theme.palette.primary.light}`,
+ scrollbarColor: `${theme.palette.secondary.dark} ${theme.palette.secondary.light}`,
+
+ '& a.MuiTypography-root': {
+ color: theme.palette.primary.light,
+ },
}
}));
@@ -20,7 +23,7 @@ const WindowSurface = ({ size, position, children }) => {
return (
<Paper
- elevation={3}
+ variant="outlined"
style={{...size, ...position}}
className={classes.surface}
>
@@ -30,4 +33,4 @@ const WindowSurface = ({ size, position, children }) => {
};
-export default WindowSurface; \ No newline at end of file
+export default WindowSurface;