From ee08bf561f5f15123b6a39f1934088129a514c41 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Tue, 6 May 2014 11:37:09 -0400 Subject: [PATCH] Fix a bunch of color issues --- app/assets/stylesheets/common/components/badges.css.scss | 2 +- app/assets/stylesheets/desktop/compose.scss | 2 +- app/assets/stylesheets/desktop/discourse.scss | 4 ++-- app/assets/stylesheets/desktop/user.scss | 1 - app/assets/stylesheets/mobile/header.scss | 4 ++-- app/assets/stylesheets/mobile/topic-post.scss | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index ecde20996a4..a94452a959a 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -71,7 +71,7 @@ h1 a.badge-category div {vertical-align: top;} line-height: 1; min-width: 11px; text-align: center; - background-color: scale-color($primary, $lightness: 90%); + background-color: scale-color($primary, $lightness: 70%); &[href] { color: $secondary; } diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index a102142a8ec..d0537c7060e 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -56,7 +56,7 @@ } .similar-topics { - background-color: scale-color($tertiary, $lightness: 40%); + background-color: scale-color($tertiary, $lightness: 60%); a[href] { color: #000; diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 0d7c41a55d7..9ca5ffe64a4 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -508,11 +508,11 @@ body { line-height: 18px; } .alert-success { - background-color: scale-color($success, $lightness: 60%);; + background-color: scale-color($success, $lightness: 75%);; color: $success; } .alert-error { - background-color: scale-color($danger, $lightness: 30%); + background-color: scale-color($danger, $lightness: 60%); color: $danger; } .alert-info { diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 2e0c138ce6b..88c06518fcf 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -278,7 +278,6 @@ .avatar { float: left; margin-right: 10px; - border: 2px solid $tertiary; width: 45px; height: 45px; } diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index bc8e01b5b70..f111dfadbc8 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -173,7 +173,7 @@ } .selected { - background-color: $tertiary; + background-color: scale-color($tertiary, $lightness: 75%); } // Notifications @@ -183,7 +183,7 @@ color: #777; } li { - background-color: $tertiary; + background-color: scale-color($tertiary, $lightness: 85%); } .read { background-color: $secondary; diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 9a371ae45f8..f8d363a9cad 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -298,7 +298,7 @@ span.post-count { height: auto; } &.moderator { - background-color: scale-color($tertiary, $lightness: 40%); + background-color: scale-color($highlight, $lightness: 60%); } }