diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-16 18:39:51 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-16 18:39:51 +0000 |
| commit | ce5d1b6fd7ed1aea2d2a675414ba81be624f2bf1 (patch) | |
| tree | b814a3f181d7349678d234324c392f96d2b2a7ca /app | |
| parent | 8a7c822dccfb612c8ae3cb646467c3deac648af8 (diff) | |
| parent | 4a0de9bdaf0bd5c18403dafc35eb2437d5e71a5f (diff) | |
| download | gitlab-ce-ce5d1b6fd7ed1aea2d2a675414ba81be624f2bf1.tar.gz | |
Merge branch '29228-update-award-emoji-native-unicode-alignment' into 'master'
Update award emoji button native emoji alignment
Closes #29228
See merge request !9985
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index f363affa46c..546718ddaf8 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -96,11 +96,9 @@ .award-control { margin: 3px 5px 3px 0; - padding: 5px 6px; + padding: .35em .4em; outline: 0; - line-height: 1; - &.disabled { cursor: default; @@ -140,10 +138,12 @@ } .icon, + gl-emoji, .award-control-icon { - float: left; - margin-right: 5px; - font-size: 18px; + vertical-align: middle; + margin-right: 0.15em; + font-size: 1.5em; + line-height: 1; } .award-control-icon-loading { @@ -154,4 +154,8 @@ color: $border-gray-normal; margin-top: 1px; } + + .award-control-text { + vertical-align: middle; + } } |