diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-02 14:17:11 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-12-02 14:17:11 +0000 |
commit | 933eafdcd3a3803e9fcf934f6f7ade667281c527 (patch) | |
tree | 94f5ab03f7cd733cc0743f3c79cf02a8de4c148f /app/javascript/styles | |
parent | ad46bc9772dfc52c7ed522658eda1a3ef608a7b3 (diff) | |
parent | 51f2eca8877d8c56a19e1b8ce4edf407c2d236fb (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript/styles')
-rw-r--r-- | app/javascript/styles/mastodon/components.scss | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 80060a00f..26ff8bf00 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1,5 +1,3 @@ -@import 'variables'; - .app-body { -webkit-overflow-scrolling: touch; -ms-overflow-style: -ms-autohiding-scrollbar; |