summaryrefslogtreecommitdiffstats
path: root/webapp/sass/layout/_markdown.scss
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2017-05-12 08:00:28 -0400
committerJoramWilander <jwawilander@gmail.com>2017-05-12 08:00:28 -0400
commit9d109b070037951fcd0832b785eba8a3db9a157c (patch)
tree5d109da2e9e088f16eff0ad1421876a3d3da412e /webapp/sass/layout/_markdown.scss
parentb1c39204a63a87d2cbc57f66cf9db50c938b2ee5 (diff)
parenta21a06afd9907e9911dcb166d902cba9f405c7cb (diff)
downloadchat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.gz
chat-9d109b070037951fcd0832b785eba8a3db9a157c.tar.bz2
chat-9d109b070037951fcd0832b785eba8a3db9a157c.zip
Merge branch 'release-3.9' into merge-3.9
Diffstat (limited to 'webapp/sass/layout/_markdown.scss')
-rw-r--r--webapp/sass/layout/_markdown.scss6
1 files changed, 6 insertions, 0 deletions
diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss
index 6fcbc7ff3..7cc79dba8 100644
--- a/webapp/sass/layout/_markdown.scss
+++ b/webapp/sass/layout/_markdown.scss
@@ -31,6 +31,12 @@ h6 {
font-weight: 700;
line-height: 1.5;
margin: 10px 0;
+
+ .emoticon {
+ min-height: 1.5em;
+ min-width: 1.5em;
+ vertical-align: top;
+ }
}
.markdown__paragraph-inline {