From 84d822959a28406c2dcb1c2bc3bacf976bcc8f48 Mon Sep 17 00:00:00 2001 From: Kris Date: Fri, 3 Aug 2018 17:43:07 -0400 Subject: [PATCH] Reducing some specificity, color fix --- .../stylesheets/common/admin/admin_base.scss | 4 +-- .../stylesheets/common/admin/customize.scss | 2 +- .../stylesheets/common/base/menu-panel.scss | 10 ++++-- .../stylesheets/common/base/topic-post.scss | 2 +- .../common/select-kit/composer-actions.scss | 11 +++---- .../stylesheets/desktop/topic-post.scss | 4 +-- app/assets/stylesheets/desktop/user-card.scss | 2 +- .../poll/assets/stylesheets/common/poll.scss | 32 ++++--------------- .../poll/assets/stylesheets/desktop/poll.scss | 4 +-- 9 files changed, 28 insertions(+), 43 deletions(-) diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index e8b33cb0822..f7a1fcb31a6 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -24,7 +24,7 @@ $mobile-breakpoint: 700px; padding: 0 0 0 10px; } - .nav.nav-pills { + .nav-pills { display: inline-flex; width: calc(100% - 10px); flex: 1 0 auto; @@ -508,7 +508,7 @@ $mobile-breakpoint: 700px; } } - .nav.nav-pills { + .nav-pills { width: calc(100% - 10px); display: inline-flex; padding: 10px; diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index bc08db8fcc3..88790fa690f 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -136,7 +136,7 @@ } } - .nav.nav-pills.fields { + .nav-pills.fields { margin-left: 10px; } .content-list, diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss index 18c5083e8da..3206bf6f2be 100644 --- a/app/assets/stylesheets/common/base/menu-panel.scss +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -55,8 +55,8 @@ } .menu-panel { - ul.menu-links li, - ul li.heading { + li, + li.heading { a { padding: 0.25em 0.5em; display: block; @@ -81,6 +81,12 @@ padding: 0.25em 0.5em; width: 50%; box-sizing: border-box; + a { + &:hover, + &:focus { + background: transparent; + } + } .badge-notification { color: dark-light-choose($primary-medium, $secondary-medium); background-color: transparent; diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 57172419259..f54b992e219 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -254,7 +254,7 @@ aside.quote { } .topic-map { - background: blend-primary-secondary(5%); + background: $primary-very-low; border: 1px solid $primary-low; border-top: none; // would cause double top border diff --git a/app/assets/stylesheets/common/select-kit/composer-actions.scss b/app/assets/stylesheets/common/select-kit/composer-actions.scss index 7e5df147061..7d89bbc71fc 100644 --- a/app/assets/stylesheets/common/select-kit/composer-actions.scss +++ b/app/assets/stylesheets/common/select-kit/composer-actions.scss @@ -8,17 +8,16 @@ padding: 0; margin-right: 5px; - .d-icon { - border: 1px solid $primary-low; - padding: 4px 5px; - margin: 0 !important; - } - &:hover, &:focus { background: $primary-low; } } + .d-icon { + border: 1px solid $primary-low; + padding: 4px 5px; + margin: 0 !important; + } } } } diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 4e78ae0b9e0..e364beaa214 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -617,7 +617,7 @@ blockquote { .quote { & > blockquote { .onebox-result { - background-color: blend-primary-secondary(5%); + background-color: $primary-very-low; } } aside { @@ -626,7 +626,7 @@ blockquote { blockquote, .onebox, .onebox-result { - background: blend-primary-secondary(5%); + background: $primary-very-low; border-left: 5px solid $primary-low; } aside.quote > blockquote, diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss index d7e470b3823..ee1b091b936 100644 --- a/app/assets/stylesheets/desktop/user-card.scss +++ b/app/assets/stylesheets/desktop/user-card.scss @@ -288,7 +288,7 @@ $user_card_background: $secondary; margin-top: 5px; .user-badge { - background: scale-color($user_card_background, $lightness: -5%); + background: $primary-very-low; border: 1px solid $primary-low; color: $user_card_primary; } diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss index 1f8e6864464..16512a08e63 100644 --- a/plugins/poll/assets/stylesheets/common/poll.scss +++ b/plugins/poll/assets/stylesheets/common/poll.scss @@ -1,11 +1,6 @@ -$border-color: rgb(219, 219, 219); -$text-color: #9e9e9e; - -$option-background: dark-light-diff($primary, $secondary, 90%, -65%); - div.poll { margin: 10px 0; - border: 1px solid $border-color; + border: 1px solid $primary-low; @include unselectable; @@ -34,23 +29,8 @@ div.poll { height: auto; } - .button { - display: inline-block; - padding: 6px 12px; - margin-right: 5px; - text-align: center; - cursor: pointer; - color: $primary; - background: dark-light-diff($primary, $secondary, 90%, -65%); - - &:hover { - background: dark-light-diff($primary, $secondary, 65%, -75%); - color: #fff; - } - } - .poll-info { - color: $text-color; + color: $primary-medium; text-align: center; vertical-align: middle; @@ -83,7 +63,7 @@ div.poll { } .info-text { margin: 0 5px; - color: $text-color; + color: $primary-medium; } } @@ -111,17 +91,17 @@ div.poll { .percentage { font-size: 20px; float: right; - color: $text-color; + color: $primary-medium; margin-left: 5px; } .bar-back { - background: $option-background; + background: $primary-low; } .bar { height: 10px; - background: dark-light-diff($primary, $secondary, 50%, -25%); + background: $primary-medium; } .chosen .bar { diff --git a/plugins/poll/assets/stylesheets/desktop/poll.scss b/plugins/poll/assets/stylesheets/desktop/poll.scss index 79ead5d01fa..6af30258252 100644 --- a/plugins/poll/assets/stylesheets/desktop/poll.scss +++ b/plugins/poll/assets/stylesheets/desktop/poll.scss @@ -8,7 +8,7 @@ div.poll { min-width: 150px; width: 100%; display: table-cell; - border-left: 1px solid $border-color; + border-left: 1px solid $primary-low; p { margin: 40px 20px; @@ -26,7 +26,7 @@ div.poll { } .poll-buttons { - border-top: 1px solid $border-color; + border-top: 1px solid $primary-low; padding: 10px; .toggle-status {