From fc79fe7b535770507e457ec996e87fbd8504c91e Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Wed, 2 Mar 2016 18:55:05 +0000
Subject: [PATCH] Renamed variables & removed some for award emoji

---
 app/assets/stylesheets/framework/variables.scss |  6 +-----
 app/assets/stylesheets/pages/awards.scss        | 10 +++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index fe8ea399d9..b038c7958d 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -156,8 +156,4 @@ $dropdown-toggle-hover-icon-color: $dropdown-toggle-hover-border-color;
  */
 $award-emoji-menu-bg: #FFF;
 $award-emoji-menu-border: #F1F2F4;
-$award-emoji-menu-radius: 3px;
-$award-emoji-menu-btn-radius: 4px;
-$award-emoji-menu-btn-hover-bg: #EDEDED;
-$award-emoji-control-active-bg: $award-emoji-menu-btn-hover-bg;
-$award-emoji-new-btn-color: #DCDCDC;
+$award-emoji-new-btn-icon-color: #DCDCDC;
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 3134511cb3..b0cd187fc0 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -17,7 +17,7 @@
   font-size: 14px;
   background-color: $award-emoji-menu-bg;
   border: 1px solid $award-emoji-menu-border;
-  border-radius: $award-emoji-menu-radius;
+  border-radius: $border-radius-base;
   box-shadow: 0 6px 12px rgba(0,0,0,.175);
 
   .emoji-menu-content {
@@ -55,10 +55,10 @@
   padding: 0;
   background: none;
   border: 0;
-  border-radius: $award-emoji-menu-btn-radius;
+  border-radius: $border-radius-base;
 
   &:hover {
-    background-color: $award-emoji-menu-btn-hover-bg;
+    background-color: $white-dark;
   }
 
   .emoji-icon {
@@ -80,7 +80,7 @@
 
   &.active,
   &:active {
-    background-color: $award-emoji-control-active-bg;
+    background-color: $white-dark;
     box-shadow: none;
     outline: 0;
   }
@@ -107,6 +107,6 @@
   }
 
   .award-control-icon {
-    color: $award-emoji-new-btn-color;
+    color: $award-emoji-new-btn-icon-color;
   }
 }