Change color of error and success

Signed-off-by: julia.kirschenheuter <julia.kirschenheuter@nextcloud.com>

diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css
index 66c355f1492693a71791af56286c5f653a1f10a5..05e21e79b962e1d62ff84b0deff3d64dd4519b8f 100644 (file)
--- a/apps/theming/css/default.css
+++ b/apps/theming/css/default.css
@@ -17,22 +17,22 @@
   --color-text-light: #222222;
   --color-text-lighter: #767676;
   --color-scrollbar: rgba(34,34,34, .15);
-  --color-error: #e9322d;
-  --color-error-rgb: 233,50,45;
-  --color-error-hover: #ed5a56;
-  --color-error-text: #e7201b;
+  --color-error: #d91812;
+  --color-error-rgb: 217,24,18;
+  --color-error-hover: #dd342f;
+  --color-error-text: #c61610;
   --color-warning: #c28900;
   --color-warning-rgb: 194,137,0;
   --color-warning-hover: #cea032;
   --color-warning-text: #996c00;
-  --color-success: #3fa857;
-  --color-success-rgb: 63,168,87;
-  --color-success-hover: #65b978;
-  --color-success-text: #318344;
-  --color-info: #006aa3;
-  --color-info-rgb: 0,106,163;
-  --color-info-hover: #3287b5;
-  --color-info-text: #006aa3;
+  --color-success: #2d7b41;
+  --color-success-rgb: 45,123,65;
+  --color-success-hover: #448955;
+  --color-success-text: #286c39;
+  --color-info: #0071ad;
+  --color-info-rgb: 0,113,173;
+  --color-info-hover: #197fb5;
+  --color-info-text: #006499;
   --color-loading-light: #cccccc;
   --color-loading-dark: #444444;
   --color-box-shadow-rgb: 77,77,77;

diff --git a/apps/theming/lib/Themes/DarkTheme.php b/apps/theming/lib/Themes/DarkTheme.php
index 5500bae3b6da62b20d2850da62cc779e6b43674f..80c65cd0eb662b5e8eed8578e22bcc2ddbaf1468 100644 (file)
--- a/apps/theming/lib/Themes/DarkTheme.php
+++ b/apps/theming/lib/Themes/DarkTheme.php
@@ -59,10 +59,10 @@ class DarkTheme extends DefaultTheme implements ITheme {
                $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
                $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
 
-               $colorError = '#e9322d';
+               $colorError = '#d91812';
                $colorWarning = '#c28900';
-               $colorSuccess = '#3fa857';
-               $colorInfo = '#006aa3';
+               $colorSuccess = '#2d7b41';
+               $colorInfo = '#0071ad';
 
                return array_merge(
                        $defaultVariables,
@@ -89,19 +89,19 @@ class DarkTheme extends DefaultTheme implements ITheme {
 
                                '--color-error' => $colorError,
                                '--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
-                               '--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 60),
-                               '--color-error-text' => $this->util->lighten($colorError, 3),
+                               '--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 85),
+                               '--color-error-text' => $this->util->lighten($colorError, 12),
                                '--color-warning' => $colorWarning,
                                '--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)),
                                '--color-warning-hover' => $this->util->mix($colorWarning, $colorMainBackground, 60),
                                '--color-warning-text' => $colorWarning,
                                '--color-success' => $colorSuccess,
                                '--color-success-rgb' => join(',', $this->util->hexToRGB($colorSuccess)),
-                               '--color-success-hover' => $this->util->mix($colorSuccess, $colorMainBackground, 60),
-                               '--color-success-text' => $colorSuccess,
+                               '--color-success-hover' => $this->util->mix($colorSuccess, $colorMainBackground, 85),
+                               '--color-success-text' => $this->util->lighten($colorSuccess, 6),
                                '--color-info' => $colorInfo,
                                '--color-info-rgb' => join(',', $this->util->hexToRGB($colorInfo)),
-                               '--color-info-hover' => $this->util->mix($colorInfo, $colorMainBackground, 60),
+                               '--color-info-hover' => $this->util->mix($colorInfo, $colorMainBackground, 85),
                                '--color-info-text' => $this->util->lighten($colorInfo, 9),
 
                                // used for the icon loading animation

diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php
index 75d738f12eec9640176c5ed6254cf29064d745ff..a0e417546c1c42d8d97945c78ede80b9df84d676 100644 (file)
--- a/apps/theming/lib/Themes/DefaultTheme.php
+++ b/apps/theming/lib/Themes/DefaultTheme.php
@@ -109,10 +109,10 @@ class DefaultTheme implements ITheme {
                $colorBoxShadow = $this->util->darken($colorMainBackground, 70);
                $colorBoxShadowRGB = join(',', $this->util->hexToRGB($colorBoxShadow));
 
-               $colorError = '#e9322d';
+               $colorError = '#d91812';
                $colorWarning = '#c28900';
-               $colorSuccess = '#3fa857';
-               $colorInfo = '#006aa3';
+               $colorSuccess = '#2d7b41';
+               $colorInfo = '#0071ad';
 
                $variables = [
                        '--color-main-background' => $colorMainBackground,
@@ -145,7 +145,7 @@ class DefaultTheme implements ITheme {
                        // error/warning/success/info feedback colours
                        '--color-error' => $colorError,
                        '--color-error-rgb' => join(',', $this->util->hexToRGB($colorError)),
-                       '--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 60),
+                       '--color-error-hover' => $this->util->mix($colorError, $colorMainBackground, 75),
                        '--color-error-text' => $this->util->darken($colorError, 4),
                        '--color-warning' => $colorWarning,
                        '--color-warning-rgb' => join(',', $this->util->hexToRGB($colorWarning)),
@@ -153,12 +153,12 @@ class DefaultTheme implements ITheme {
                        '--color-warning-text' => $this->util->darken($colorWarning, 8),
                        '--color-success' => $colorSuccess,
                        '--color-success-rgb' => join(',', $this->util->hexToRGB($colorSuccess)),
-                       '--color-success-hover' => $this->util->mix($colorSuccess, $colorMainBackground, 60),
-                       '--color-success-text' => $this->util->darken($colorSuccess, 10),
+                       '--color-success-hover' => $this->util->mix($colorSuccess, $colorMainBackground, 78),
+                       '--color-success-text' => $this->util->darken($colorSuccess, 4),
                        '--color-info' => $colorInfo,
                        '--color-info-rgb' => join(',', $this->util->hexToRGB($colorInfo)),
-                       '--color-info-hover' => $this->util->mix($colorInfo, $colorMainBackground, 60),
-                       '--color-info-text' => $colorInfo,
+                       '--color-info-hover' => $this->util->mix($colorInfo, $colorMainBackground, 80),
+                       '--color-info-text' => $this->util->darken($colorInfo, 4),
 
                        // used for the icon loading animation
                        '--color-loading-light' => '#cccccc',