Merge branch 'update-color-codes-to-graphical-profile'

5 files changed, 20 insertions, 16 deletions

diff --git a/gui/src/config.json b/gui/src/config.json
index 9e11eea254..95ed24c452 100644
--- a/gui/src/config.json
+++ b/gui/src/config.json
@@ -12,7 +12,7 @@
     "blue": "rgb(41, 77, 115)",
     "green": "rgb(68, 173, 77)",
     "darkGreen": "rgb(32, 84, 37)",
-    "red": "rgb(208, 2, 27)",
+    "red": "rgb(227, 64, 57)",
     "darkYellow": "rgb(142, 78, 19)",
     "yellow": "rgb(255, 213, 36)",
     "white": "rgb(255, 255, 255)",
@@ -24,9 +24,11 @@
     "blue40": "rgba(41, 77, 115, 0.4)",
     "blue60": "rgba(41, 77, 115, 0.6)",
     "blue80": "rgba(41, 77, 115, 0.8)",
-    "red95": "rgba(208, 2, 27, 0.95)",
-    "red40": "rgba(208, 2, 27, 0.40)",
-    "red45": "rgba(208, 2, 27, 0.45)",
+    "red95": "rgba(227, 64, 57, 0.95)",
+    "red80": "rgba(227, 64, 57, 0.80)",
+    "red60": "rgba(227, 64, 57, 0.60)",
+    "red40": "rgba(227, 64, 57, 0.40)",
+    "red45": "rgba(227, 64, 57, 0.45)",
     "green90": "rgba(68, 173, 77, 0.9)",
     "green40": "rgba(68, 173, 77, 0.4)"
   }
diff --git a/gui/src/renderer/components/AppButtonStyles.tsx b/gui/src/renderer/components/AppButtonStyles.tsx
index 055ce9b031..e9594e3994 100644
--- a/gui/src/renderer/components/AppButtonStyles.tsx
+++ b/gui/src/renderer/components/AppButtonStyles.tsx
@@ -27,10 +27,10 @@ export default {
     backgroundColor: colors.white40,
   }),
   redTransparent: Styles.createButtonStyle({
-    backgroundColor: colors.red40,
+    backgroundColor: colors.red60,
   }),
   redTransparentHover: Styles.createButtonStyle({
-    backgroundColor: colors.red45,
+    backgroundColor: colors.red80,
   }),
   common: Styles.createViewStyle({
     cursor: 'default',
diff --git a/gui/src/renderer/components/HeaderBar.tsx b/gui/src/renderer/components/HeaderBar.tsx
index 71ef37186b..1da3fd77c8 100644
--- a/gui/src/renderer/components/HeaderBar.tsx
+++ b/gui/src/renderer/components/HeaderBar.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Button, Component, Styles, Text, Types, View } from 'reactxp';
+import { colors } from '../../config.json';
 import { messages } from '../../shared/gettext';
 import ImageView from './ImageView';
 
@@ -36,16 +37,16 @@ const headerBarStyles = {
   }),
   barStyle: {
     default: Styles.createViewStyle({
-      backgroundColor: 'rgb(41, 77, 115)', // colors.blue
+      backgroundColor: colors.blue,
     }),
     defaultDark: Styles.createViewStyle({
-      backgroundColor: 'rgb(25, 46, 69)', // colors.darkBlue
+      backgroundColor: colors.darkBlue,
     }),
     error: Styles.createViewStyle({
-      backgroundColor: 'rgb(208, 2, 27)', // colors.red
+      backgroundColor: colors.red,
     }),
     success: Styles.createViewStyle({
-      backgroundColor: 'rgb(68, 173, 77)', // colors.green
+      backgroundColor: colors.green,
     }),
   },
 };
@@ -83,7 +84,7 @@ const brandStyles = {
     fontWeight: '900',
     lineHeight: 30,
     letterSpacing: -0.5,
-    color: 'rgba(255, 255, 255, 0.6)', // colors.white60
+    color: colors.white80,
     marginLeft: 8,
   }),
 };
@@ -117,8 +118,8 @@ export class SettingsBarButton extends Component<ISettingsButtonProps> {
           height={24}
           width={24}
           source="icon-settings"
-          tintColor={'rgba(255, 255, 255, 0.6)'}
-          tintHoverColor={'rgba(255, 255, 255, 0.8)'}
+          tintColor={'rgba(255, 255, 255, 0.8)'}
+          tintHoverColor={'rgba(255, 255, 255, 1.0)'}
         />
       </Button>
     );
diff --git a/gui/src/renderer/components/SecuredLabel.tsx b/gui/src/renderer/components/SecuredLabel.tsx
index dbe1791305..fc91a97773 100644
--- a/gui/src/renderer/components/SecuredLabel.tsx
+++ b/gui/src/renderer/components/SecuredLabel.tsx
@@ -22,7 +22,7 @@ const styles = {
     color: 'rgb(68, 173, 77)', // green
   }),
   unsecured: Styles.createTextStyle({
-    color: 'rgb(208, 2, 27)', // red
+    color: 'rgb(227, 64, 57)', // red
   }),
 };
 
diff --git a/gui/src/renderer/components/SettingsHeader.tsx b/gui/src/renderer/components/SettingsHeader.tsx
index d7af1f9023..57be8653c4 100644
--- a/gui/src/renderer/components/SettingsHeader.tsx
+++ b/gui/src/renderer/components/SettingsHeader.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import { Component, Styles, Text, Types, View } from 'reactxp';
+import { colors } from '../../config.json';
 
 const styles = {
   header: {
@@ -16,7 +17,7 @@ const styles = {
     fontSize: 32,
     fontWeight: '900',
     lineHeight: 36,
-    color: 'rgb(255, 255, 255)',
+    color: colors.white,
   }),
   subtitle: Styles.createTextStyle({
     marginTop: 8,
@@ -24,7 +25,7 @@ const styles = {
     fontSize: 13,
     fontWeight: '600',
     overflow: 'visible',
-    color: 'rgba(255, 255, 255, 0.8)', // colors.white80
+    color: colors.white80,
     lineHeight: 20,
     letterSpacing: -0.2,
   }),