Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
},
"main": "public/electron.js",
"dependencies": {
"@material-ui/core": "^4.8.2",
"@material-ui/core": "^4.8.3",
"@material-ui/icons": "^4.5.1",
"axios": "^0.19.0",
"axios": "^0.19.1",
"cross-env": "^6.0.3",
"crypto-js": "^3.1.9-1",
"electron-is-dev": "^1.1.0",
Expand Down Expand Up @@ -78,7 +78,7 @@
},
"devDependencies": {
"concurrently": "^5.0.2",
"electron": "^7.1.7",
"electron": "^7.1.8",
"electron-builder": "^21.2.0",
"wait-on": "^3.3.0"
}
Expand Down
3 changes: 1 addition & 2 deletions src/components/Topbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ const Topbar = () => {
return (
<div className={classes.root}>
<AppBar position="fixed" color={"primary"} className={open ? classes.appBarShift + ' ' + classes.appBar : classes.appBar}>
<Toolbar variant={"dense"}>
<Toolbar>
<IconButton edge="start" className={open ? classes.hide : null} color="inherit"
aria-label="menu" onClick={openDrawer}>
<MenuIcon/>
Expand All @@ -120,7 +120,6 @@ const Topbar = () => {
{languageEnabled ?
<div>
<IconButton
aria-label="Account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
onClick={handleMenu}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/About/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const useStyles = makeStyles(theme => ({
overflow: 'auto',
},
heroContent: {
backgroundColor: theme.palette.background.default,
backgroundColor: theme.palette.background.paper,
padding: theme.spacing(4, 0, 2),
},
container: {
Expand Down
2 changes: 1 addition & 1 deletion src/routes/File/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import Input from '@material-ui/core/Input';

const useStyles = makeStyles(theme => ({
heroContent: {
backgroundColor: theme.palette.background.default,
backgroundColor: theme.palette.background.paper,
padding: theme.spacing(4, 0, 2),
},
content: {
Expand Down
2 changes: 1 addition & 1 deletion src/routes/Home/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import AlertDialog from "../../components/AlertDialog";

const useStyles = makeStyles(theme => ({
heroContent: {
backgroundColor: theme.palette.background.default,
backgroundColor: theme.palette.background.paper,
padding: theme.spacing(4, 0, 2),
},
content: {
Expand Down
2 changes: 1 addition & 1 deletion src/routes/Settings/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const useStyles = makeStyles(theme => ({
overflow: 'auto',
},
heroContent: {
backgroundColor: theme.palette.background.default,
backgroundColor: theme.palette.background.paper,
padding: theme.spacing(4, 0, 2),
},
container: {
Expand Down
2 changes: 1 addition & 1 deletion src/routes/Text/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import BackButton from "../../components/BackButton";

const useStyles = makeStyles(theme => ({
heroContent: {
backgroundColor: theme.palette.background.default,
backgroundColor: theme.palette.background.paper,
padding: theme.spacing(4, 0, 2),
},
content: {
Expand Down
184 changes: 89 additions & 95 deletions yarn.lock

Large diffs are not rendered by default.