From d091c6dddaf60d2ce1cf2c07fa92006bf7d27b86 Mon Sep 17 00:00:00 2001 From: Sam Lanning Date: Sun, 24 Jan 2016 11:53:30 +0000 Subject: [PATCH] Added more gray color variables (to compensate for inconsistent compiling) // FREEBIE --- stylesheets/_conversation.scss | 8 ++++---- stylesheets/_index.scss | 2 +- stylesheets/_variables.scss | 3 +++ stylesheets/manifest.css | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index 4146ddf7ee01..bd1c27c0e648 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -608,15 +608,15 @@ border-radius: 5px; outline: none; padding: 5px 8px; - border: 1px solid darken($grey_l, 10%); + border: 1px solid $grey_l2; &:focus { - border-color: darken($grey_l, 40%); + border-color: $grey_l4; } &:hover { - background-color: darken($grey_l, 10%); - border-color: darken($grey_l, 20%); + background-color: $grey_l2; + border-color: $grey_l3; } } } diff --git a/stylesheets/_index.scss b/stylesheets/_index.scss index a7288e19a228..e549822945f7 100644 --- a/stylesheets/_index.scss +++ b/stylesheets/_index.scss @@ -61,7 +61,7 @@ } .conversation-header { - border-bottom: solid 1px darken($grey_l, 10%); + border-bottom: solid 1px $grey_l2; margin-bottom: 4px; padding-bottom: 5px; .avatar { diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss index 36773a1d09cd..df6952ff5d67 100644 --- a/stylesheets/_variables.scss +++ b/stylesheets/_variables.scss @@ -2,6 +2,9 @@ $blue_l: #a2d2f4; $blue: #2090ea; $grey_l: #f3f3f3; +$grey_l2: #d9d9d9; // ~ Equivalent to darken($grey_l, 10%), unreliably compiles +$grey_l3: darken($grey_l, 20%); +$grey_l4: darken($grey_l, 40%); $grey: #616161; $grey_d: #454545; diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css index e5934904e669..eca5b59a4e03 100644 --- a/stylesheets/manifest.css +++ b/stylesheets/manifest.css @@ -1035,11 +1035,11 @@ input.search { border-radius: 5px; outline: none; padding: 5px 8px; - border: 1px solid #dadada; } + border: 1px solid #d9d9d9; } .confirmation-dialog .modal .buttons button:focus { border-color: #8d8d8d; } .confirmation-dialog .modal .buttons button:hover { - background-color: #dadada; + background-color: #d9d9d9; border-color: silver; } /*# sourceMappingURL=manifest.css.map */