diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index 75907c35b7e900fcc35c6328412c35fa9980ccf5..19166757e6489110dc95543e3be62c5b7d03f896 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -1,4 +1,7 @@ .awards { + display: flex; + flex-wrap: wrap; + .emoji-icon { width: 20px; height: 20px; @@ -100,7 +103,6 @@ .award-menu-holder { display: inline-block; - position: absolute; .tooltip { white-space: nowrap; @@ -108,9 +110,11 @@ } .award-control { - margin: 0 5px 6px 0; + margin: 4px 8px 4px 0; outline: 0; position: relative; + display: block; + float: left; &.disabled { cursor: default; diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 75e0cd6eaa6ebbff92fc18603a849a3b22dfaf45..b3f310ff67d964b91f62985507711bad1ea8b6b4 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 702e76625271506b3f59d2783f6299a2c9c2241b..f923a1104a953068edd6edcce44534c760c7fa5b 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 0000000000000000000000000000000000000000..da3df0f90931aa5374a0d8032926e8fca8dcd229 --- /dev/null +++ b/changelogs/unreleased/32720-emoji-spacing.yml @@ -0,0 +1,4 @@ +--- +title: Create equal padding for emoji +merge_request: +author: