summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGeorge Tsiolis <tsiolis.g@gmail.com>2018-06-25 13:54:34 +0300
committerGeorge Tsiolis <tsiolis.g@gmail.com>2018-06-27 19:27:59 +0300
commit907d050d59f8c5b29f250295815e97e19767a77c (patch)
tree8b1e50f3fee01d7620436eaaa91f9263a3e2aa28 /app
parent07de43a7e07cefcbb60e7ed84c684f478eae8b93 (diff)
downloadgitlab-ce-907d050d59f8c5b29f250295815e97e19767a77c.tar.gz
Fix paragraph line height for emoji
Diffstat (limited to 'app')
-rw-r--r--app/assets/stylesheets/framework/awards.scss4
-rw-r--r--app/assets/stylesheets/framework/emojis.scss1
2 files changed, 5 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss
index a538b5a2946..8d11b92cf88 100644
--- a/app/assets/stylesheets/framework/awards.scss
+++ b/app/assets/stylesheets/framework/awards.scss
@@ -104,6 +104,10 @@
position: relative;
top: 3px;
}
+
+ > gl-emoji {
+ line-height: 1.5;
+ }
}
.award-menu-holder {
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss
index 527e7d57c5c..3cde0490371 100644
--- a/app/assets/stylesheets/framework/emojis.scss
+++ b/app/assets/stylesheets/framework/emojis.scss
@@ -4,4 +4,5 @@ gl-emoji {
vertical-align: middle;
font-family: "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-size: 1.5em;
+ line-height: 0.9;
}