Fix app bar color is inconsistent on Windows & Linux (#197)

webcatalog · Jun 15, 2020 · 9ba6234 · 9ba6234
1 parent ad3b0e9
commit 9ba6234
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/components/pages/history/index.js b/src/components/pages/history/index.js
@@ -61,8 +61,10 @@ const styles = (theme) => ({
     marginTop: 12,
   },
   appBarColorDefault: {
-    background: theme.palette.type === 'dark' ? theme.palette.grey[900] : theme.palette.primary.main,
-    color: theme.palette.type === 'dark' ? theme.palette.getContrastText(theme.palette.grey[900]) : theme.palette.primary.contrastText,
+    // eslint-disable-next-line no-nested-ternary
+    background: theme.palette.type === 'dark' ? theme.palette.grey[900] : (window.process.platform === 'darwin' ? theme.palette.primary.main : null),
+    // eslint-disable-next-line no-nested-ternary
+    color: theme.palette.type === 'dark' ? theme.palette.getContrastText(theme.palette.grey[900]) : (window.process.platform === 'darwin' ? theme.palette.primary.contrastText : null),
   },
   title: {
     flex: 1,

diff --git a/src/components/pages/phrasebook/index.js b/src/components/pages/phrasebook/index.js
@@ -59,8 +59,10 @@ const styles = (theme) => ({
     marginTop: 12,
   },
   appBarColorDefault: {
-    background: theme.palette.type === 'dark' ? theme.palette.grey[900] : theme.palette.primary.main,
-    color: theme.palette.type === 'dark' ? theme.palette.getContrastText(theme.palette.grey[900]) : theme.palette.primary.contrastText,
+    // eslint-disable-next-line no-nested-ternary
+    background: theme.palette.type === 'dark' ? theme.palette.grey[900] : (window.process.platform === 'darwin' ? theme.palette.primary.main : null),
+    // eslint-disable-next-line no-nested-ternary
+    color: theme.palette.type === 'dark' ? theme.palette.getContrastText(theme.palette.grey[900]) : (window.process.platform === 'darwin' ? theme.palette.primary.contrastText : null),
   },
   title: {
     flex: 1,

diff --git a/src/components/pages/preferences/index.js b/src/components/pages/preferences/index.js
@@ -77,9 +77,10 @@ const styles = (theme) => ({
     color: theme.palette.text.secondary,
   },
   appBarColorDefault: {
-    background: theme.palette.type === 'dark' ? theme.palette.grey[900] : theme.palette.primary.main,
-    color: theme.palette.type === 'dark' ? theme.palette.getContrastText(theme.palette.grey[900]) : theme.palette.primary.contrastText,
-
+    // eslint-disable-next-line no-nested-ternary
+    background: theme.palette.type === 'dark' ? theme.palette.grey[900] : (window.process.platform === 'darwin' ? theme.palette.primary.main : null),
+    // eslint-disable-next-line no-nested-ternary
+    color: theme.palette.type === 'dark' ? theme.palette.getContrastText(theme.palette.grey[900]) : (window.process.platform === 'darwin' ? theme.palette.primary.contrastText : null),
   },
   title: {
     flex: 1,