Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-15 06:17:15 +00:00
parent 8ee6ed358f 74c1c9ec01
commit 0c7dc6c781
13 changed files with 51 additions and 13 deletions
--- 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) {