diff options
| author | Phil Hughes <me@iamphill.com> | 2017-05-25 07:47:18 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-05-25 07:47:18 +0000 |
| commit | 7c7fe22c27820b941af51bdef84c3832dda0683e (patch) | |
| tree | f4bfd28326f71cf4a6679b9617aed955dd621de0 /app | |
| parent | 7737ef52a94aeee9d282a4201e35191054ff70d5 (diff) | |
| parent | 2ce86e5491dc94bd2361bd45b2a565f690ce3a33 (diff) | |
| download | gitlab-ce-7c7fe22c27820b941af51bdef84c3832dda0683e.tar.gz | |
Merge branch '32850-award-emoji-off' into 'master'
Fix alignment of hover state on emoji button
Closes #32850
See merge request !11691
Diffstat (limited to 'app')
| -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 0db3ac1a60e..d64b1237b2c 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); } |