summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Eastwood <contact@ericeastwood.com>2017-08-28 15:11:34 -0500
committerEric Eastwood <contact@ericeastwood.com>2017-08-29 12:03:22 -0500
commita0814a8dfb83f4f0acf74072623a2a4fea85f23f (patch)
tree31f84833c547e886a9ef9957a6943c7f3eb6ffe6
parent6f0f65becbbe968bd26a5a3872044d7b8633bf2e (diff)
downloadgitlab-ce-a0814a8dfb83f4f0acf74072623a2a4fea85f23f.tar.gz
Better align fallback image emojis
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/37147
-rw-r--r--app/assets/stylesheets/framework/typography.scss2
-rw-r--r--changelogs/unreleased/37147-fix-fallback-emoji-alignment.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 71eec0e1a5e..368cc71c5a6 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -10,7 +10,7 @@
color: $md-link-color;
}
- img {
+ img:not(.emoji) {
/*max-width: 100%;*/
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