Merge branch 'ce-to-ee-2018-06-28' into 'master'

CE upstream - 2018-06-28 18:21 UTC See merge request gitlab-org/gitlab-ee!6321

Merge branch 'ce-to-ee-2018-06-28' into 'master'
CE upstream - 2018-06-28 18:21 UTC See merge request gitlab-org/gitlab-ee!6321
f6dbacb8 · Robert Speicher · d555a8a4 · b12a1eba · f6dbacb8 · f6dbacb8
Commit f6dbacb8 authored Jun 29, 2018 by Robert Speicher
3 changed files
--- 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 {

--- 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;
 }
--- a/changelogs/unreleased/fix-paragraph-line-height-for-emoji.yml
+++ b/changelogs/unreleased/fix-paragraph-line-height-for-emoji.yml
+---
+title: Fix paragraph line height for emoji
+merge_request: 20137
+author: George Tsiolis
+type: fixed