From 5356ff13c803bbeb9aa39412f92124351e9ea9d9 Mon Sep 17 00:00:00 2001 From: Coen van der Kamp Date: Sat, 22 Sep 2018 23:10:38 +0200 Subject: [PATCH] Simplify color functions and round numbers. --- .../wagtailadmin/scss/_variables.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/wagtail/admin/static_src/wagtailadmin/scss/_variables.scss b/wagtail/admin/static_src/wagtailadmin/scss/_variables.scss index 252a37c4e..72f4c763c 100644 --- a/wagtail/admin/static_src/wagtailadmin/scss/_variables.scss +++ b/wagtail/admin/static_src/wagtailadmin/scss/_variables.scss @@ -26,8 +26,8 @@ $breakpoint-desktop-larger: 100em; // 1600px // colours $color-teal: #43b1b0; -$color-teal-darker: darken($color-teal, 10%); -$color-teal-dark: darken(saturate(adjust-hue($color-teal, 1), 0.37), 21.96); +$color-teal-darker: darken($color-teal, 10); +$color-teal-dark: darken($color-teal, 22); $color-blue: #71b2d4; $color-red: #cd3238; @@ -42,20 +42,20 @@ $color-black: #000; $color-grey-1: darken($color-white, 80); $color-grey-2: darken($color-white, 60); -$color-grey-3: darken($color-white, 14.9); -$color-grey-4: darken($color-white, 9.8); -$color-grey-5: darken($color-white, 1.96); +$color-grey-3: darken($color-white, 15); +$color-grey-4: darken($color-white, 10); +$color-grey-5: darken($color-white, 2); -$color-menu-text: darken($color-white, 20.78); +$color-menu-text: darken($color-white, 20); $color-thead-bg: $color-grey-5; $color-header-bg: $color-teal; $color-fieldset-hover: $color-grey-5; $color-input-border: $color-grey-4; -$color-input-focus: lighten(saturate(adjust-hue($color-teal, 1), 12.06), 49.41); -$color-input-focus-border: lighten(saturate(adjust-hue($color-teal, 1), 11.8), 9.41); -$color-input-error-bg: lighten(saturate(adjust-hue($color-red, -1), 28.69), 46.27); +$color-input-focus: lighten(saturate($color-teal, 12), 50); +$color-input-focus-border: lighten(saturate($color-teal, 12), 10); +$color-input-error-bg: lighten(saturate($color-red, 28), 45); $color-button: $color-teal; $color-button-hover: $color-teal-darker;