diff --git a/app/assets/stylesheets/application/discourse.css.scss b/app/assets/stylesheets/application/discourse.css.scss index 2883c91c7ed..c33d1b0edd0 100644 --- a/app/assets/stylesheets/application/discourse.css.scss +++ b/app/assets/stylesheets/application/discourse.css.scss @@ -219,8 +219,8 @@ form { blockquote { /* 13px left is intentional here to properly align with post quotes */ padding: 10px 8px 1px 13px; - background-color: #f1f1f1; - border-left: 5px solid #dddddd; + background-color: $quote-background; + border-left: 5px solid darken($quote-background, 20%); p { margin: 0 0 10px 0; } diff --git a/app/assets/stylesheets/application/topic.css.scss b/app/assets/stylesheets/application/topic.css.scss index 67babb69fe6..58c4f26145c 100644 --- a/app/assets/stylesheets/application/topic.css.scss +++ b/app/assets/stylesheets/application/topic.css.scss @@ -155,11 +155,9 @@ } } a.mention, .ac-wrap .item span { - @include border-radius-all(5px); - @include linear-gradient(lighten($light_gray, 10%), $light_gray); - border: 1px solid $gray; - color: $darkish_gray; - padding: 1px 2px; + @include border-radius-all(6px); + color: $quote-background; + padding: 1px 5px; } a.mention { cursor: pointer; @@ -187,19 +185,19 @@ // When we are quoting something aside.quote { - border-left: 5px solid #d7d7d7; + border-left: 5px solid darken($quote-background, 20%); margin-top: 14px; font-size: 14px; line-height: 20px; padding-left: 5px; - background-color: #f1f1f1; + background-color: $quote-background; overflow: hidden; &:nth-of-type(1) { margin: 0; } .title { padding: 8px 8px 0px; - background-color: #f1f1f1; + background-color: $quote-background; a, .avatar { margin-right: 4px; diff --git a/app/assets/stylesheets/foundation/variables.scss b/app/assets/stylesheets/foundation/variables.scss index 5daf1864088..3732eb88ca0 100644 --- a/app/assets/stylesheets/foundation/variables.scss +++ b/app/assets/stylesheets/foundation/variables.scss @@ -155,6 +155,8 @@ $link_color: darken($blue, 10%); $muted-link-color: #999; $muted-important-link-color: #5d5d5d; +$quote-background: #f1f1f1; + // Colors based on basics $topicMenuColor: darken($white, 80%);