diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-28 15:36:05 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-28 15:36:05 +0000 |
| commit | e38af20cc6eae4f001fd98b0450f00f496a278d0 (patch) | |
| tree | a709ce96f91d36ff00aa7e1363d6d43de5895dae /app | |
| parent | 6be703dd59cd35fb94ee4496a2d52af696d8cd70 (diff) | |
| parent | 907d050d59f8c5b29f250295815e97e19767a77c (diff) | |
| download | gitlab-ce-e38af20cc6eae4f001fd98b0450f00f496a278d0.tar.gz | |
Merge branch 'fix-paragraph-line-height-for-emoji' into 'master'
Fix paragraph line height for emoji
Closes #48003
See merge request gitlab-org/gitlab-ce!20137
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 1 |
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; } |