From 54c0bea294c368eea05e0f2927f30bfed8450461 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 19 Aug 2015 13:27:17 -0400 Subject: [PATCH] Darken asides on a dark theme. Create a mixin to DRY things up. --- app/assets/stylesheets/common/base/discourse.scss | 3 +-- app/assets/stylesheets/common/base/onebox.scss | 11 +++++------ app/assets/stylesheets/common/base/topic-post.scss | 4 ++-- app/assets/stylesheets/common/foundation/mixins.scss | 7 +++++++ .../stylesheets/common/foundation/variables.scss | 1 + 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index ce6ca6682c3..ae6aba12daf 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -32,8 +32,7 @@ small { blockquote { - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -75%); - background-color: dark-light-diff($primary, $secondary, 97%, -65%); + @include post-aside; overflow: hidden; clear: both; } diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 11e3fecf3bb..390ac83d527 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -11,10 +11,10 @@ a.loading-onebox { .onebox-result { + @include post-aside; + margin-top: 15px; padding: 12px 25px 12px 12px; - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -75%); - background-color: dark-light-diff($primary, $secondary, 97%, -65%); font-size: 1em; > .source { margin-bottom: 12px; @@ -88,9 +88,9 @@ a.loading-onebox { } aside.onebox { + @include post-aside; + padding: 12px 25px 12px 12px; - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -75%); - background-color: dark-light-diff($primary, $secondary, 97%, -65%); font-size: 1em; header { @@ -147,8 +147,7 @@ aside.onebox .onebox-body .onebox-avatar { blockquote { aside.onebox { - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -75%); - background-color: dark-light-diff($primary, $secondary, 97%, -65%); + @include post-aside; } } diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index f0eee220af7..cb9565288dc 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -50,8 +50,8 @@ aside.quote { .badge-wrapper { margin-left: 5px; } .title { - border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -75%); - background-color: dark-light-diff($primary, $secondary, 97%, -65%); + @include post-aside; + color: scale-color($primary, $lightness: 30%); // IE will screw up the blockquote underneath if bottom padding is 0px padding: 12px 12px 1px 12px; diff --git a/app/assets/stylesheets/common/foundation/mixins.scss b/app/assets/stylesheets/common/foundation/mixins.scss index 2243802d16e..4b560cc46f9 100644 --- a/app/assets/stylesheets/common/foundation/mixins.scss +++ b/app/assets/stylesheets/common/foundation/mixins.scss @@ -93,3 +93,10 @@ -moz-user-select: none; -ms-user-select: none; } + + +// Stuff we repeat +@mixin post-aside { + border-left: 5px solid dark-light-diff($primary, $secondary, 90%, -85%); + background-color: dark-light-diff($primary, $secondary, 97%, -75%); +} diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss index 0c51ce420a6..e4b97ef9eda 100644 --- a/app/assets/stylesheets/common/foundation/variables.scss +++ b/app/assets/stylesheets/common/foundation/variables.scss @@ -19,6 +19,7 @@ $twitter: #00bced !default; $yahoo: #810293 !default; $github: #6d6d6d !default; + // Fonts // --------------------------------------------------