Merge pull request #3516 from awesomerobot/master

a few color variable fixes for the topic map
discourse · Jun 2, 2015 · 9dd6b65 · 9dd6b65
2 parents e895418 + 93de39f
commit 9dd6b65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss
@@ -271,9 +271,9 @@
 
   &.clicks {
     font-weight: normal;
-    background-color: #ddd;
+    background-color: dark-light-diff($primary, $secondary, 85%, -65%);
     top: -1px;
-    color: #888;
+    color: dark-light-diff($primary, $secondary, 50%, -45%);
     position: relative;
     margin-left: 2px;
     border: none;

diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
@@ -309,7 +309,7 @@ a.star {
 
 .topic-map {
   margin: 20px 0 0 0;
-  background: dark-light-diff($primary, $secondary, 97%, -45%);
+  background: dark-light-diff($primary, $secondary, 97%, -75%);
   border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
   border-top: none; // would cause double top border
 
@@ -415,12 +415,12 @@ a.star {
       border: 0;
       padding: 0 23px;
       color: $primary;
-      background: dark-light-diff($primary, $secondary, 97%, -45%);
+      background: dark-light-diff($primary, $secondary, 97%, -75%);
       border-left: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
       border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -65%);
       &:hover {
         color: $primary;
-        background: dark-light-diff($primary, $secondary, 90%, -65%);
+        background: dark-light-diff($primary, $secondary, 90%, -80%);
       }
 
       &.collapsed {