diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-08 13:40:31 +0000 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-06-08 13:40:31 +0000 |
commit | ba564a09d73dce3a6696dfeb55e78648ae23e627 (patch) | |
tree | e48a59bb3471e7d219a65520e4583d375f023da7 /app/assets/stylesheets/pages | |
parent | a982a45349d092846d75892195e2f1be780741e5 (diff) | |
parent | ad27e799b737f9d6aeef703315e4a32ba7925d8f (diff) | |
download | gitlab-ce-ba564a09d73dce3a6696dfeb55e78648ae23e627.tar.gz |
Merge branch '32720-emoji-spacing' into 'master'
32720 Create equal spacing between emoji buttons and remove unnecessary margin-bottom
Closes #32720
See merge request !11889
Diffstat (limited to 'app/assets/stylesheets/pages')
-rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/issues.scss | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 75e0cd6eaa6..b3f310ff67d 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -58,7 +58,7 @@ } .emoji-block { - padding: 10px 0 4px; + padding: 10px 0; } } diff --git a/app/assets/stylesheets/pages/issues.scss b/app/assets/stylesheets/pages/issues.scss index 702e7662527..f923a1104a9 100644 --- a/app/assets/stylesheets/pages/issues.scss +++ b/app/assets/stylesheets/pages/issues.scss @@ -249,14 +249,19 @@ ul.related-merge-requests > li { } @media (min-width: $screen-sm-min) { - .new-branch-col { - padding-top: 0; - text-align: right; - } + .emoji-block .row { + display: flex; - .create-mr-dropdown-wrap { - .btn-group:not(.hide) { - display: inline-block; + .new-branch-col { + padding-top: 0; + text-align: right; + align-self: center; + } + + .create-mr-dropdown-wrap { + .btn-group:not(.hide) { + display: inline-block; + } } } } |