summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-09-17 11:56:59 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-09-17 11:56:59 -0400
commit7901126b638a173a2d9752473e799417444466a7 (patch)
tree3b9afcd4d4dc982899bd9506df759eb64cc75de3 /web/sass-files/sass/partials
parentde64bd19d5a9811ee2539baa8fdb61c4ece57378 (diff)
parent99d0db136cfaa88cf654c77e30fd1867136db9d5 (diff)
downloadchat-7901126b638a173a2d9752473e799417444466a7.tar.gz
chat-7901126b638a173a2d9752473e799417444466a7.tar.bz2
chat-7901126b638a173a2d9752473e799417444466a7.zip
Merge pull request #701 from mattermost/PLT-40
PLT-40 adding experimental support for emojis
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r--web/sass-files/sass/partials/_base.scss8
1 files changed, 8 insertions, 0 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index e817761ee..cdc2152e9 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -128,3 +128,11 @@ div.theme {
.white-bg {
background-color: white !important;
}
+
+.emoji {
+ width: 1.5em;
+ height: 1.5em;
+ display: inline-block;
+ margin-bottom: 0.25em;
+ background-size: contain;
+}