Merge branch '32850-award-emoji-off' into 'master'

Fix alignment of hover state on emoji button Closes #32850 See merge request !11691

Merge branch '32850-award-emoji-off' into 'master'
7c7fe22c · Phil Hughes · 7737ef52 · 2ce86e54 · 7c7fe22c
Commit 7c7fe22c authored May 25, 2017 by Phil Hughes
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

awards.scss app/assets/stylesheets/framework/awards.scss +3 -2

No files found.
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -110,6 +110,7 @@
 .award-control {
  margin: 0 5px 6px 0;
  outline: 0;
+  position: relative;

  &.disabled {
    cursor: default;
@@ -227,8 +228,8 @@
  .award-control-icon-positive,
  .award-control-icon-super-positive {
    position: absolute;
-    left: 11px;
-    bottom: 7px;
+    left: 10px;
+    bottom: 6px;
    opacity: 0;
    @include transition(opacity, transform);
  }