Skip to content

Commit cda4a0a

Browse files
authored
Merge pull request #12 from CodeDead/feature/refactor
Feature/refactor
2 parents 6ae060d + fcd2fe8 commit cda4a0a

File tree

8 files changed

+98
-105
lines changed

8 files changed

+98
-105
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
},
3636
"main": "public/electron.js",
3737
"dependencies": {
38-
"@material-ui/core": "^4.8.2",
38+
"@material-ui/core": "^4.8.3",
3939
"@material-ui/icons": "^4.5.1",
40-
"axios": "^0.19.0",
40+
"axios": "^0.19.1",
4141
"cross-env": "^6.0.3",
4242
"crypto-js": "^3.1.9-1",
4343
"electron-is-dev": "^1.1.0",
@@ -78,7 +78,7 @@
7878
},
7979
"devDependencies": {
8080
"concurrently": "^5.0.2",
81-
"electron": "^7.1.7",
81+
"electron": "^7.1.8",
8282
"electron-builder": "^21.2.0",
8383
"wait-on": "^3.3.0"
8484
}

src/components/Topbar/index.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const Topbar = () => {
108108
return (
109109
<div className={classes.root}>
110110
<AppBar position="fixed" color={"primary"} className={open ? classes.appBarShift + ' ' + classes.appBar : classes.appBar}>
111-
<Toolbar variant={"dense"}>
111+
<Toolbar>
112112
<IconButton edge="start" className={open ? classes.hide : null} color="inherit"
113113
aria-label="menu" onClick={openDrawer}>
114114
<MenuIcon/>
@@ -120,7 +120,6 @@ const Topbar = () => {
120120
{languageEnabled ?
121121
<div>
122122
<IconButton
123-
aria-label="Account of current user"
124123
aria-controls="menu-appbar"
125124
aria-haspopup="true"
126125
onClick={handleMenu}

src/routes/About/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const useStyles = makeStyles(theme => ({
1414
overflow: 'auto',
1515
},
1616
heroContent: {
17-
backgroundColor: theme.palette.background.default,
17+
backgroundColor: theme.palette.background.paper,
1818
padding: theme.spacing(4, 0, 2),
1919
},
2020
container: {

src/routes/File/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import Input from '@material-ui/core/Input';
1717

1818
const useStyles = makeStyles(theme => ({
1919
heroContent: {
20-
backgroundColor: theme.palette.background.default,
20+
backgroundColor: theme.palette.background.paper,
2121
padding: theme.spacing(4, 0, 2),
2222
},
2323
content: {

src/routes/Home/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import AlertDialog from "../../components/AlertDialog";
1818

1919
const useStyles = makeStyles(theme => ({
2020
heroContent: {
21-
backgroundColor: theme.palette.background.default,
21+
backgroundColor: theme.palette.background.paper,
2222
padding: theme.spacing(4, 0, 2),
2323
},
2424
content: {

src/routes/Settings/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const useStyles = makeStyles(theme => ({
3434
overflow: 'auto',
3535
},
3636
heroContent: {
37-
backgroundColor: theme.palette.background.default,
37+
backgroundColor: theme.palette.background.paper,
3838
padding: theme.spacing(4, 0, 2),
3939
},
4040
container: {

src/routes/Text/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import BackButton from "../../components/BackButton";
1313

1414
const useStyles = makeStyles(theme => ({
1515
heroContent: {
16-
backgroundColor: theme.palette.background.default,
16+
backgroundColor: theme.palette.background.paper,
1717
padding: theme.spacing(4, 0, 2),
1818
},
1919
content: {

yarn.lock

Lines changed: 89 additions & 95 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)