summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2016-09-07 10:04:59 -0700
committertauriedavis <taurie@gitlab.com>2016-09-07 10:04:59 -0700
commit8a2b89f3ceedfba7d5b8ac196d2925d114b1cdeb (patch)
treeb19175c18db6d3601157d26de33c36f69993a04f /app/assets/stylesheets
parent7da2dcc12dbc11ed9790d94861fc23f0962f331c (diff)
downloadgitlab-ce-8a2b89f3ceedfba7d5b8ac196d2925d114b1cdeb.tar.gz
fix margin for multi-line emojis
Diffstat (limited to 'app/assets/stylesheets')
-rw-r--r--app/assets/stylesheets/framework/blocks.scss4
-rw-r--r--app/assets/stylesheets/pages/awards.scss2
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/blocks.scss b/app/assets/stylesheets/framework/blocks.scss
index 7ce203d2ec7..f5223207f3a 100644
--- a/app/assets/stylesheets/framework/blocks.scss
+++ b/app/assets/stylesheets/framework/blocks.scss
@@ -249,6 +249,10 @@
> .controls {
float: right;
}
+
+ .new-branch {
+ margin-top: 3px;
+ }
}
.content-block-small {
diff --git a/app/assets/stylesheets/pages/awards.scss b/app/assets/stylesheets/pages/awards.scss
index 188a4e193a6..447ba24b46b 100644
--- a/app/assets/stylesheets/pages/awards.scss
+++ b/app/assets/stylesheets/pages/awards.scss
@@ -93,6 +93,8 @@
}
.award-control {
+ margin-top: 3px;
+ margin-bottom: 3px;
margin-right: 5px;
padding-left: 5px;
padding-right: 5px;