about summary refs log tree commit diff
path: root/app/javascript/styles
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-15 06:17:15 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-15 06:17:15 +0000
commit0c7dc6c78123728a9a0a32e16c2ad524e76926c8 (patch)
treed599071d84f545e16a8ebaddf6e215cadc89247d /app/javascript/styles
parent8ee6ed358ff5706e3d0c402a9b23846b51f6d451 (diff)
parent74c1c9ec01addc7474d74712f76fb6d6d5eecdf7 (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript/styles')
-rw-r--r--app/javascript/styles/mastodon/components.scss4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index a2e908683..71bffdaa6 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1613,6 +1613,10 @@
   justify-content: flex-start;
   overflow-x: auto;
   position: relative;
+
+  &.unscrollable {
+    overflow-x: hidden;
+  }
 }
 
 @media screen and (min-width: 360px) {