Commit ba564a09 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

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
parents a982a453 ad27e799
.awards { .awards {
display: flex;
flex-wrap: wrap;
.emoji-icon { .emoji-icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
...@@ -100,7 +103,6 @@ ...@@ -100,7 +103,6 @@
.award-menu-holder { .award-menu-holder {
display: inline-block; display: inline-block;
position: absolute;
.tooltip { .tooltip {
white-space: nowrap; white-space: nowrap;
...@@ -108,9 +110,11 @@ ...@@ -108,9 +110,11 @@
} }
.award-control { .award-control {
margin: 0 5px 6px 0; margin: 4px 8px 4px 0;
outline: 0; outline: 0;
position: relative; position: relative;
display: block;
float: left;
&.disabled { &.disabled {
cursor: default; cursor: default;
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
} }
.emoji-block { .emoji-block {
padding: 10px 0 4px; padding: 10px 0;
} }
} }
......
...@@ -249,9 +249,13 @@ ul.related-merge-requests > li { ...@@ -249,9 +249,13 @@ ul.related-merge-requests > li {
} }
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
.emoji-block .row {
display: flex;
.new-branch-col { .new-branch-col {
padding-top: 0; padding-top: 0;
text-align: right; text-align: right;
align-self: center;
} }
.create-mr-dropdown-wrap { .create-mr-dropdown-wrap {
...@@ -259,4 +263,5 @@ ul.related-merge-requests > li { ...@@ -259,4 +263,5 @@ ul.related-merge-requests > li {
display: inline-block; display: inline-block;
} }
} }
}
} }
---
title: Create equal padding for emoji
merge_request:
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment