diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-08-17 21:03:36 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-18 12:00:21 -0500 |
| commit | f993d7f0404143e1dd3bc8fc5d817852a89d95d8 (patch) | |
| tree | 1601398126c5a4ddbe339640791a7b3f74169b04 | |
| parent | eac2f24d715616df8c9f327fc7a109f3fa65b8c4 (diff) | |
| download | gitlab-ce-f993d7f0404143e1dd3bc8fc5d817852a89d95d8.tar.gz | |
Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'
Fixes the blown up emoji problem in notes
Closes #36448 and #36282
See merge request !13632
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index bf5f124d142..5f590d3078c 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -18,7 +18,8 @@ background-color: $gray-lightest; } - img.js-lazy-loaded { + img.js-lazy-loaded, + img.emoji { min-width: inherit; min-height: inherit; background-color: inherit; |