summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-02-20 07:10:54 +0500
committerJoram Wilander <jwawilander@gmail.com>2017-02-19 21:10:54 -0500
commit22118fafc8650214a3de13cf0cfa5a698b0e9a4a (patch)
tree7f16cd8b1e79bf8eee880eb80b84d32ea2a008be /webapp
parent00d11e961f6a32f7d4880c40fd6359574d665a4e (diff)
downloadchat-22118fafc8650214a3de13cf0cfa5a698b0e9a4a.tar.gz
chat-22118fafc8650214a3de13cf0cfa5a698b0e9a4a.tar.bz2
chat-22118fafc8650214a3de13cf0cfa5a698b0e9a4a.zip
PLT-5573 - Fixing emoticons (#5461)
Diffstat (limited to 'webapp')
-rw-r--r--webapp/sass/components/_emoticons.scss15
-rw-r--r--webapp/sass/layout/_post.scss1
2 files changed, 11 insertions, 5 deletions
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss
index c5c4ca936..43d2e8ece 100644
--- a/webapp/sass/components/_emoticons.scss
+++ b/webapp/sass/components/_emoticons.scss
@@ -19,13 +19,20 @@
height: 30px;
line-height: 30px;
width: 100%;
+
+ > div {
+ &:first-child {
+ text-align: center;
+ width: 30px;
+ }
+ }
}
.emoticon-suggestion__image {
- height: 20px;
- margin: 6px 6px 0 5px;
+ margin-top: -2px;
+ max-height: 20px;
+ max-width: 20px;
padding: 0;
text-align: center;
- vertical-align: top;
- width: 20px;
+ vertical-align: middle;
}
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 6afcf099a..6f148cd7e 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -1137,7 +1137,6 @@
padding: 0 4px 0 3px;
.post-reaction__emoji {
- height: auto;
margin: 2px 3px 0 0;
max-height: 16px;
max-width: 16px;