From f255cbcbe316627b7307416cb975c050bdc228b2 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 12 Apr 2018 18:29:28 -0700 Subject: [PATCH] Move to white background for ios replies, hairline bottom border --- stylesheets/_ios.scss | 21 +++++---------------- stylesheets/_variables.scss | 2 ++ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/stylesheets/_ios.scss b/stylesheets/_ios.scss index dc3c38f73..76c854fcb 100644 --- a/stylesheets/_ios.scss +++ b/stylesheets/_ios.scss @@ -116,7 +116,7 @@ $ios-border-color: rgba(0,0,0,0.1); // Not ideal, but necessary to override the specificity of the android theme color // classes used in conversations.scss background-color: white !important; - border: 1px solid lightgray !important; + border: 1px solid $grey_l1_5 !important; border-bottom: none !important; margin-top: 0px; @@ -130,7 +130,7 @@ $ios-border-color: rgba(0,0,0,0.1); .text, .filename-label, .type-label { - border-left: 2px solid lightgray; + border-left: 2px solid $grey_l1; padding: 5px; padding-left: 7px; // Without this smaller bottom padding, text beyond four lines still shows up! @@ -144,7 +144,7 @@ $ios-border-color: rgba(0,0,0,0.1); .ios-label { display: block; - color: lightgray; + color: $grey_l1; font-size: smaller; margin-bottom: 3px; } @@ -192,20 +192,9 @@ $ios-border-color: rgba(0,0,0,0.1); .incoming { .bubble { .quote { - background-color: lightgray !important; border-left: none; - - .ios-label { - color: white; - } - - .primary { - .text, - .filename-label, - .type-label { - border-left: 2px solid white; - } - } + border: none !important; + border-bottom: 1px solid lightgray !important; } } } diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss index 70364d890..0b44fef8c 100644 --- a/stylesheets/_variables.scss +++ b/stylesheets/_variables.scss @@ -2,6 +2,8 @@ $blue_l: #a2d2f4; $blue: #2090ea; $grey_l: #f3f3f3; +$grey_l1: #bdbdbd; +$grey_l1_5: #e6e6e6; $grey_l2: #d9d9d9; // ~ Equivalent to darken($grey_l, 10%), unreliably compiles $grey_l3: darken($grey_l, 20%); $grey_l4: darken($grey_l, 40%);