diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index 75907c35b7e..b4069a6d8e3 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -100,7 +100,6 @@ .award-menu-holder { display: inline-block; - position: absolute; .tooltip { white-space: nowrap; @@ -108,7 +107,7 @@ } .award-control { - margin: 0 5px 6px 0; + margin: 4px 8px 4px 0; outline: 0; position: relative; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index c2346f2f1c3..4abad3f2697 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; + } } } } diff --git a/changelogs/unreleased/32720-emoji-spacing.yml b/changelogs/unreleased/32720-emoji-spacing.yml new file mode 100644 index 00000000000..da3df0f9093 --- /dev/null +++ b/changelogs/unreleased/32720-emoji-spacing.yml @@ -0,0 +1,4 @@ +--- +title: Create equal padding for emoji +merge_request: +author: