diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-03-16 18:39:51 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-03-17 11:23:19 +0800 |
| commit | 1460a7364e9834519c4b4dfc62c2a2805e041e0f (patch) | |
| tree | 4406233d31904f573d8fdeaaf0b3192fac20d502 | |
| parent | beb566752f475b351e6399074cb4e651b6c6f90a (diff) | |
| download | gitlab-ce-1460a7364e9834519c4b4dfc62c2a2805e041e0f.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
| -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; + } } |