Merge 0f43d9c into c06a23e

mattermost · Mar 30, 2017 · eb1f5ba · eb1f5ba
2 parents c06a23e + 0f43d9c
commit eb1f5ba
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss
@@ -5,11 +5,11 @@
     background-repeat: no-repeat;
     background-size: contain;
     display: inline-block;
-    height: 21px;
+    max-height: 21px;
     min-height: 1em;
     min-width: 1em;
     vertical-align: middle;
-    width: 21px;
+    max-width: 21px;
 }
 
 .emoticon-suggestion {
@@ -174,6 +174,7 @@
             width: 21px;
             padding: 0px;
             border: 0px;
+            text-align: center;
         }
     }
 
@@ -183,6 +184,11 @@
         font-size: 18px;
         margin: 3px;
     }
+    .emoticon {
+        min-height: 0;
+        min-width: 0;
+        margin: 0 auto;
+    }
 }
 .emojisprite-wrapper {
     cursor: pointer;
@@ -207,6 +213,7 @@
         vertical-align: middle;
         height: 36px;
         width: 42px;
+        text-align: center;
 
         .sprite-preview {
             height: 36px;
@@ -221,8 +228,6 @@
     .emoji-picker__preview-image {
         max-height: 36px;
         max-width: 42px;
-        padding: 0 10px 0 0;
-
     }
 
     .emoji-picker__preview-name {