Slight revisions before Beta 7 check
Signed-off-by: Marquis Kurt <software@marquiskurt.net>
This commit is contained in:
parent
2dda4ffb08
commit
122e6dbc7f
|
@ -3220,14 +3220,6 @@
|
||||||
"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
|
"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"bindings": {
|
|
||||||
"version": "1.5.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
|
|
||||||
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
|
|
||||||
"requires": {
|
|
||||||
"file-uri-to-path": "1.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"bluebird": {
|
"bluebird": {
|
||||||
"version": "3.5.4",
|
"version": "3.5.4",
|
||||||
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
|
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz",
|
||||||
|
@ -7336,11 +7328,6 @@
|
||||||
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
|
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"event-target-shim": {
|
|
||||||
"version": "1.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-1.1.1.tgz",
|
|
||||||
"integrity": "sha1-qG5e5r2qFgVEddp5fM3fDFVphJE="
|
|
||||||
},
|
|
||||||
"eventemitter3": {
|
"eventemitter3": {
|
||||||
"version": "3.1.0",
|
"version": "3.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
|
||||||
|
@ -8038,11 +8025,6 @@
|
||||||
"schema-utils": "^1.0.0"
|
"schema-utils": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"file-uri-to-path": {
|
|
||||||
"version": "1.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
|
|
||||||
"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
|
|
||||||
},
|
|
||||||
"filename-regex": {
|
"filename-regex": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
|
||||||
|
@ -12861,16 +12843,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node-mac-notifier": {
|
|
||||||
"version": "1.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/node-mac-notifier/-/node-mac-notifier-1.2.0.tgz",
|
|
||||||
"integrity": "sha512-+9FZ01BbPMv3pQVRWgPlaIKbhQl35Pn3WmRg96zIrCJHb4XvClnAqc0+aPfHrWs8o1PYMAQFeYK5tF69ljkKQw==",
|
|
||||||
"requires": {
|
|
||||||
"bindings": "^1.2.1",
|
|
||||||
"event-target-shim": "^1.1.1",
|
|
||||||
"uuid": "^3.3.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node-notifier": {
|
"node-notifier": {
|
||||||
"version": "5.4.0",
|
"version": "5.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz",
|
"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.0.tgz",
|
||||||
|
@ -20273,7 +20245,8 @@
|
||||||
"uuid": {
|
"uuid": {
|
||||||
"version": "3.3.2",
|
"version": "3.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
|
||||||
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
|
"integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
|
||||||
|
"dev": true
|
||||||
},
|
},
|
||||||
"validate-npm-package-license": {
|
"validate-npm-package-license": {
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
|
|
|
@ -145,15 +145,15 @@ class SettingsPage extends Component<any, ISettingsState> {
|
||||||
this.setState({ currentUser: data });
|
this.setState({ currentUser: data });
|
||||||
})
|
})
|
||||||
.catch((err: Error) => {
|
.catch((err: Error) => {
|
||||||
let acct = localStorage.getItem("account");
|
let acct = localStorage.getItem("account");
|
||||||
if (acct) {
|
if (acct) {
|
||||||
this.setState({ currentUser: JSON.parse(acct) });
|
this.setState({ currentUser: JSON.parse(acct) });
|
||||||
} else {
|
} else {
|
||||||
this.props.enqueueSnackbar(
|
this.props.enqueueSnackbar(
|
||||||
"Couldn't find profile info: " + err.name
|
"Couldn't find profile info: " + err.name
|
||||||
);
|
);
|
||||||
console.error(err.message);
|
console.error(err.message);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ export const styles = (theme: Theme) =>
|
||||||
titleBarRoot: {
|
titleBarRoot: {
|
||||||
top: 0,
|
top: 0,
|
||||||
left: 0,
|
left: 0,
|
||||||
height: 24,
|
height: 40,
|
||||||
width: "100%",
|
width: "100%",
|
||||||
backgroundColor: "rgba(0, 0, 0, 0.2)",
|
backgroundColor: "rgba(0, 0, 0, 0.2)",
|
||||||
textAlign: "center",
|
textAlign: "center",
|
||||||
|
@ -38,7 +38,7 @@ export const styles = (theme: Theme) =>
|
||||||
titleBarText: {
|
titleBarText: {
|
||||||
color: theme.palette.common.white,
|
color: theme.palette.common.white,
|
||||||
fontSize: 12,
|
fontSize: 12,
|
||||||
paddingTop: 2,
|
paddingTop: 10,
|
||||||
paddingBottom: 1
|
paddingBottom: 1
|
||||||
},
|
},
|
||||||
paper: {
|
paper: {
|
||||||
|
|
|
@ -193,7 +193,7 @@ if (isDarwinApp()) {
|
||||||
name: "Aqua (Dynamic)",
|
name: "Aqua (Dynamic)",
|
||||||
palette: {
|
palette: {
|
||||||
primary: {
|
primary: {
|
||||||
main: isDarkMode() ? "#353538" : "#EEEEEE"
|
main: isDarkMode() ? "#353538" : "#D6D6D6"
|
||||||
},
|
},
|
||||||
secondary: {
|
secondary: {
|
||||||
main: getAquaAccentColor()
|
main: getAquaAccentColor()
|
||||||
|
|
|
@ -47,7 +47,7 @@ export function getDarwinAccentColor(): number {
|
||||||
);
|
);
|
||||||
return themeInteger === "" ? -2 : parseInt(themeInteger);
|
return themeInteger === "" ? -2 : parseInt(themeInteger);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the app component from the desktop app
|
* Get the app component from the desktop app
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue