diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-30 08:38:31 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-30 08:38:31 +0000 |
| commit | 7839a5ec39ba5a990059b24036b0c46bf731eb42 (patch) | |
| tree | 88cb09ec78769a2876ca1c5e2df64b920b837f85 | |
| parent | dacb63384506591c585e77b32468227739f2a034 (diff) | |
| parent | 934d09698cce2f913d4ca36e4b5c223e1ea75e85 (diff) | |
| download | gitlab-ce-7839a5ec39ba5a990059b24036b0c46bf731eb42.tar.gz | |
Merge branch '37147-fix-fallback-emoji-alignment' into 'master'
Better align fallback image emojis
Closes #37147
See merge request !13881
| -rw-r--r-- | app/assets/stylesheets/framework/typography.scss | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/37147-fix-fallback-emoji-alignment.yml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss index 71eec0e1a5e..b2423bc1a66 100644 --- a/app/assets/stylesheets/framework/typography.scss +++ b/app/assets/stylesheets/framework/typography.scss @@ -10,8 +10,7 @@ color: $md-link-color; } - img { - /*max-width: 100%;*/ + img:not(.emoji) { margin: 0 0 8px; } diff --git a/changelogs/unreleased/37147-fix-fallback-emoji-alignment.yml b/changelogs/unreleased/37147-fix-fallback-emoji-alignment.yml new file mode 100644 index 00000000000..34161e63c81 --- /dev/null +++ b/changelogs/unreleased/37147-fix-fallback-emoji-alignment.yml @@ -0,0 +1,5 @@ +--- +title: Better align fallback image emojis +merge_request: +author: +type: fixed |