summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-16 09:12:30 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-16 09:12:30 -0700
commit8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73 (patch)
tree84e426d92eccf017f0fd5ccd22815a2139bd6e44 /web/sass-files/sass/partials
parent6a1755d2e32c3f3bcaa67c33f32cb5eb5ab76ea2 (diff)
parent9c045f0d4bdf254f57b94356fd2f5f2a2408ed03 (diff)
downloadchat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.gz
chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.tar.bz2
chat-8b2d7f391aedeb5d6bd6490b92bdadf5050e1c73.zip
Fixing merge
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r--web/sass-files/sass/partials/_post_right.scss3
-rw-r--r--web/sass-files/sass/partials/_search.scss3
-rw-r--r--web/sass-files/sass/partials/_sidebar--left.scss3
3 files changed, 6 insertions, 3 deletions
diff --git a/web/sass-files/sass/partials/_post_right.scss b/web/sass-files/sass/partials/_post_right.scss
index 9557d7570..91f9355de 100644
--- a/web/sass-files/sass/partials/_post_right.scss
+++ b/web/sass-files/sass/partials/_post_right.scss
@@ -93,7 +93,8 @@
.post-right__scroll {
position: relative;
- overflow: auto;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
}
.post-right-comment-time {
diff --git a/web/sass-files/sass/partials/_search.scss b/web/sass-files/sass/partials/_search.scss
index ca90ec46d..2f15a445f 100644
--- a/web/sass-files/sass/partials/_search.scss
+++ b/web/sass-files/sass/partials/_search.scss
@@ -67,8 +67,9 @@
}
.search-items-container {
- overflow: auto;
position: relative;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
}
.search-results-header {
diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss
index 831c19cff..585a51f08 100644
--- a/web/sass-files/sass/partials/_sidebar--left.scss
+++ b/web/sass-files/sass/partials/_sidebar--left.scss
@@ -47,7 +47,8 @@
.nav-pills__container {
height: 100%;
position: relative;
- overflow: auto;
+ overflow: scroll;
+ -webkit-overflow-scrolling: touch;
}
.nav-pills__unread-indicator {