diff options
author | Phil Hughes <me@iamphill.com> | 2017-05-25 07:47:18 +0000 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-08 11:56:41 +0000 |
commit | 2febdfa97d837eaf861e17f4f50cd04ecee43ea0 (patch) | |
tree | f0a69fd62f7add09677730ccba191e2ff52ba4ca | |
parent | 158e4bdf6831bda9016d7d5a981fb2f0b64e2cb7 (diff) | |
download | gitlab-ce-2febdfa97d837eaf861e17f4f50cd04ecee43ea0.tar.gz |
Merge branch '32850-award-emoji-off' into 'master'
Fix alignment of hover state on emoji button
Closes #32850
See merge request !11691
-rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index df24a02f068..75907c35b7e 100644 --- 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); } |