From bea61d063a038f2e25c8172f52eec4648412d2c0 Mon Sep 17 00:00:00 2001
From: Julius Haertl <jus@bitgrid.net>
Date: Mon, 20 Feb 2017 16:15:53 +0100
Subject: [PATCH] Simplify colors

Signed-off-by: Julius Haertl <jus@bitgrid.net>
---
 core/css/variables.scss | 52 +++++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/core/css/variables.scss b/core/css/variables.scss
index 459bafee0e..3ac67e9ad2 100644
--- a/core/css/variables.scss
+++ b/core/css/variables.scss
@@ -1,7 +1,8 @@
 $color-main-text: #000000;
 $color-main-text-dimmed: #555555;
 $color-main-background: #ffffff;
-$color-main-background-dimmed: #f8f8f8;
+$color-main-background-dimmed: #f0f0f0;
+
 $color-primary: #0082c9;
 $color-primary-text: #ffffff;
 $color-error: #e9322d;
@@ -13,32 +14,33 @@ $color-box-shadow: rgba(lighten($color-main-text-dimmed, 25%), 0.75);
 $image-logo: '../img/logo-icon.svg?v=1';
 $image-login-background: '../img/background.jpg?v=1';
 
+// need to be reduced/replaced
+$color-main-old-ff0000: $color-error;
+$color-main-old-ffdddd: rgba($color-error, .15);
 
-// Variables with old color values
-// Need simplification once the merge is looking good so far
-$color-main-old-333333: #333333;
-$color-main-old-eeeeee: #eee;
 $color-main-old-fafafa: #fafafa;
 $color-main-old-f8f8f8: #f8f8f8;
-$color-main-old-bbbbbb: #bbb;
-$color-main-old-888888: #888;
-$color-main-old-999999: #999;
-$color-main-old-dddddd: #ddd;
-$color-main-old-666666: #666;
-$color-main-old-777777: #777;
-$color-main-old-555555: #555;
-$color-main-old-cccccc: #ccc;
-$color-main-old-aaaaaa: #aaa;
-$color-main-old-222222: #222;
-$color-main-old-f0f0f0: #f0f0f0;
-$color-main-old-e8e8e8: #e8e8e8;
-$color-main-old-ffdddd: #fdd;
-$color-main-old-ffffee: #fee;
-$color-main-old-ff0000: #f00;
-$color-main-old-d3d3d3: #d3d3d3;
-$color-main-old-190: rgb(190, 190, 190);
+$color-main-old-245: rgb(245,245,245);
+$color-main-old-f0f0f0: f0f0f0;
 $color-main-old-238: rgb(238, 238, 238);
-$color-main-old-150: rgb(150, 150, 150);
+$color-main-old-eeeeee: #eee;
+$color-main-old-e8e8e8: #e8e8e8;
+$color-main-old-dddddd: #ddd;
+$color-main-old-220: rgb(220, 220, 200);
+$color-main-old-d3d3d3: #d3d3d3;
+$color-main-old-cccccc: #ccc;
 $color-main-old-187: rgb(198, 198, 198);
-$color-main-old-220: rgb(220, 220, 220);
-$color-main-old-245: rgb(245, 245, 245);
\ No newline at end of file
+$color-main-old-190: rgb(190, 190, 190);
+$color-main-old-bbbbbb: #bbb;
+$color-main-old-aaaaaa: #aaa;
+$color-main-old-999999: #999;
+$color-main-old-150: rgb(150, 150, 150);
+$color-main-old-888888: #888;
+$color-main-old-777777: #777;
+$color-main-old-666666: #666;
+$color-main-old-555555: #555;
+$color-main-old-222222: #222;
+$color-main-old-333333: #333333;
+
+// warning color (.exception class) not sure where it exists
+$color-main-old-ffffee: #ffe;