From df7f2ef34035447fec8411648147f23399e604c9 Mon Sep 17 00:00:00 2001 From: Bianca Cheng Costanzo Date: Tue, 2 Jan 2018 20:42:32 +0100 Subject: [PATCH 1/3] Simplifying backgrounds to match lightgray in service-ui and ui-components --- client/app/styles/_base.scss | 2 +- client/app/styles/_variables.scss | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss index 015c271d4f..79087ed030 100644 --- 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; diff --git a/client/app/styles/_variables.scss b/client/app/styles/_variables.scss index c4267b29aa..bf6f38909f 100644 --- a/client/app/styles/_variables.scss +++ b/client/app/styles/_variables.scss @@ -12,9 +12,8 @@ $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-dark-color: $primary-color; @@ -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); From fcaa622578eb20e672c8258778eb18a96558ccd0 Mon Sep 17 00:00:00 2001 From: Bianca Cheng Costanzo Date: Wed, 3 Jan 2018 10:20:16 +0100 Subject: [PATCH 2/3] Shifting highlight colours darker for more contrast --- client/app/styles/_variables.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/app/styles/_variables.scss b/client/app/styles/_variables.scss index bf6f38909f..a1e71bd5da 100644 --- a/client/app/styles/_variables.scss +++ b/client/app/styles/_variables.scss @@ -14,8 +14,8 @@ $primary-color: $weave-charcoal-blue; $background-color: #f8f8f8; $background-lighter-color: lighten($background-color, 8%); -$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%); From 715ff542630b6f609147b59f909ce1da6c8be159 Mon Sep 17 00:00:00 2001 From: Bianca Cheng Costanzo Date: Fri, 5 Jan 2018 17:46:45 +0100 Subject: [PATCH 3/3] Row alteration coloring --- client/app/styles/_base.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/styles/_base.scss b/client/app/styles/_base.scss index 79087ed030..4addf32c22 100644 --- a/client/app/styles/_base.scss +++ b/client/app/styles/_base.scss @@ -2044,7 +2044,7 @@ a { } tr:nth-child(even) { - background: $background-color; + background: $background-darker-secondary-color; } tbody tr {