From 6166e7888846b8f23f43af6cd2c81d1b063381e7 Mon Sep 17 00:00:00 2001
From: Kris Aubuchon <shout@k-ris.com>
Date: Wed, 13 Aug 2014 00:03:29 -0400
Subject: [PATCH] adding hover state to notification menu, and small additional
 fixes

---
 app/assets/stylesheets/common/admin/admin_base.scss | 2 +-
 app/assets/stylesheets/common/base/header.scss      | 7 +++----
 app/assets/stylesheets/common/base/upload.scss      | 6 ++++++
 app/assets/stylesheets/desktop/topic-post.scss      | 4 ++--
 app/assets/stylesheets/desktop/upload.scss          | 3 ---
 app/assets/stylesheets/desktop/user.scss            | 2 +-
 app/assets/stylesheets/mobile/upload.scss           | 3 ---
 7 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index badac6c4e70..dad09c247d7 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -272,7 +272,7 @@ td.flaggers td {
 
   .setting.overridden {
     input[type=text] {
-      background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -10%);
+      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
 
     }
 
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index df5c06e79bd..7f997ee9903 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -184,7 +184,7 @@
       }
 
       &:hover a:not(.badge-notification) {
-        background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -70%);
+        background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
         }
 
       button {margin-left: 5px;}
@@ -205,15 +205,14 @@
     .icon { color: scale-color($primary, $lightness: 30%); }
     li {
       background-color: dark-light-diff($tertiary, $secondary, 90%, -60%);
-      padding: 4px 0 3px 2px;
       i {
         float: left;
         margin-right: 5px;
         padding-top: 2px;
       }
       span { color: $primary; }
-      &:hover a { background: transparent; }
-      a { padding: 1px; }
+      &:hover a { background-color: dark-light-diff($highlight, $secondary, 50%, -70%); }
+      a { padding: 4px 0 3px 2px; }
       p {
         margin: 0;
         overflow: hidden;
diff --git a/app/assets/stylesheets/common/base/upload.scss b/app/assets/stylesheets/common/base/upload.scss
index 0df6f9594b5..da091d287b6 100644
--- a/app/assets/stylesheets/common/base/upload.scss
+++ b/app/assets/stylesheets/common/base/upload.scss
@@ -9,3 +9,9 @@
     1px -1px 0 scale-color($tertiary, $lightness: -10%),
     -1px 1px 0 scale-color($tertiary, $lightness: -10%);
 }
+
+.uploaded-image-preview {
+  background-position: center center;
+  background-size: cover;
+  background-color: $primary;
+}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index d58c1f9342b..973eb8070a2 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -610,7 +610,7 @@ text-overflow: ellipsis;
 
 .moderator {
   .topic-body {
-    background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -80%);
+    background-color: dark-light-diff($highlight, $secondary, 50%, -80%);
   }
 }
 
@@ -861,7 +861,7 @@ $topic-avatar-width: 45px;
 .dropdown-menu .active > a:hover {
   color: $primary;
   text-decoration: none;
-  background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -70%);
+  background-color: dark-light-diff($highlight, $secondary, 50%, -70%);
 
 }
 
diff --git a/app/assets/stylesheets/desktop/upload.scss b/app/assets/stylesheets/desktop/upload.scss
index 5682dae8513..d55a27e86ee 100644
--- a/app/assets/stylesheets/desktop/upload.scss
+++ b/app/assets/stylesheets/desktop/upload.scss
@@ -32,9 +32,6 @@
 
 .uploaded-image-preview {
   height: 270px;
-  background-position: center center;
-  background-size: cover;
-  background-color: $primary;
 }
 
 .image-upload-controls {
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index f9d492a483d..b323e9dd451 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -303,7 +303,7 @@
       color: $primary;
     }
     .item.moderator-action {
-      background-color: dark-light-diff(rgba($highlight,.7), $secondary, 50%, -10%);
+      background-color: dark-light-diff($highlight, $secondary, 50%, -10%);
     }
     .item.deleted {
       opacity: 0.8;
diff --git a/app/assets/stylesheets/mobile/upload.scss b/app/assets/stylesheets/mobile/upload.scss
index 94270eec573..5c61b6fcf27 100644
--- a/app/assets/stylesheets/mobile/upload.scss
+++ b/app/assets/stylesheets/mobile/upload.scss
@@ -13,7 +13,4 @@
 
 .uploaded-image-preview {
   height: 150px;
-  background-position: center center;
-  background-size: cover;
-  background-color: $primary;
 }