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 {
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;
......
......@@ -58,7 +58,7 @@
}
.emoji-block {
padding: 10px 0 4px;
padding: 10px 0;
}
}
......
......@@ -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;
}
}
}
}
---
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