Merge pull request #3011 from weaveworks/lightgray-standardisation

Simplifying backgrounds to match lightgray in service-ui and ui-compo…
weaveworks · Jan 5, 2018 · 5379371 · 5379371
2 parents e2e0496 + 715ff54
commit 5379371
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss
@@ -96,7 +96,7 @@ a {
 
 .overlay-wrapper {
   align-items: center;
-  background-color: fade-out($background-average-color, 0.1);
+  background-color: fade-out($background-color, 0.1);
   border-radius: 4px;
   color: $text-tertiary-color;
   display: flex;
@@ -2044,7 +2044,7 @@ a {
     }
 
     tr:nth-child(even) {
-      background: $background-color;
+      background: $background-darker-secondary-color;
     }
 
     tbody tr {

diff --git a/client/app/styles/_variables.scss b/client/app/styles/_variables.scss
@@ -12,11 +12,10 @@ $mono-font: "Menlo", "DejaVu Sans Mono", "Liberation Mono", monospace;
 $base-ease: ease-in-out;
 $primary-color: $weave-charcoal-blue;
 
-$background-color: lighten($primary-color, 66%);
+$background-color: #f8f8f8;
 $background-lighter-color: lighten($background-color, 8%);
-$background-average-color: mix($background-color, $background-lighter-color);
-$background-darker-color: darken($background-color, 8%);
-$background-darker-secondary-color: darken($background-color, 4%);
+$background-darker-color: darken($background-color, 16%);
+$background-darker-secondary-color: darken($background-color, 8%);
 $background-dark-color: $primary-color;
 $text-color: lighten($primary-color, 5%);
 $text-secondary-color: lighten($text-color, 15%);
@@ -58,5 +57,5 @@ $search-border-width: 1px;
 $timeline-height: 55px;
 
 /* specific elements */
-$body-background-color: $background-average-color;
-$label-background-color: fade-out($background-average-color, .3);
+$body-background-color: $background-color;
+$label-background-color: fade-out($background-color, .3);