summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
authorSaturnino Abril <saturnino.abril@gmail.com>2017-06-19 02:23:17 +0800
committerCorey Hulen <corey@hulen.com>2017-06-18 11:23:17 -0700
commit0231e95f1c5a8c42ba97875f0d2301815f552974 (patch)
treea9ea7ece6d44960f617f90705d8d580b9db7d189 /webapp/sass
parentacdab8cce6656c2fced5802c4692604773b0055b (diff)
downloadchat-0231e95f1c5a8c42ba97875f0d2301815f552974.tar.gz
chat-0231e95f1c5a8c42ba97875f0d2301815f552974.tar.bz2
chat-0231e95f1c5a8c42ba97875f0d2301815f552974.zip
Fix Emoji picker cut off at RHS (#6602)
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/components/_emoticons.scss2
-rw-r--r--webapp/sass/layout/_post-right.scss1
2 files changed, 1 insertions, 2 deletions
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss
index 24d53eef3..b91630a47 100644
--- a/webapp/sass/components/_emoticons.scss
+++ b/webapp/sass/components/_emoticons.scss
@@ -103,7 +103,7 @@
}
.emoji-picker__items {
- max-height: 262px;
+ max-height: 278px;
overflow-x: hidden;
overflow-y: auto;
padding: 0px 8px 8px 8px;
diff --git a/webapp/sass/layout/_post-right.scss b/webapp/sass/layout/_post-right.scss
index 85dd20f53..e6ee33f85 100644
--- a/webapp/sass/layout/_post-right.scss
+++ b/webapp/sass/layout/_post-right.scss
@@ -148,7 +148,6 @@
.post-right__scroll {
-webkit-overflow-scrolling: touch;
@include flex(1 1 auto);
- overflow: auto;
padding-top: 10px;
position: relative;