diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 10:47:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 10:47:29 +0000 |
| commit | 77216386be94dae90b51622f3cb917cc7ab6145b (patch) | |
| tree | f7eb11fbc2612750aa05f8961909a05c9d039b5d | |
| parent | c013a9de148c7a4557c0ae80449ba4c7fbf2746b (diff) | |
| parent | 2def2cc60abeeb22c1f77e93b7c437ddcf7aa68c (diff) | |
| download | gitlab-ce-77216386be94dae90b51622f3cb917cc7ab6145b.tar.gz | |
Merge branch 'scrollbar-issue' into 'master'
Hide scrollbar from sidebar when external mouse is connected to OSX
See merge request !977
| -rw-r--r-- | app/assets/stylesheets/generic/sidebar.scss | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/stylesheets/generic/sidebar.scss b/app/assets/stylesheets/generic/sidebar.scss index 4e9daa5ea34..b96664d30db 100644 --- a/app/assets/stylesheets/generic/sidebar.scss +++ b/app/assets/stylesheets/generic/sidebar.scss @@ -3,7 +3,8 @@ position: fixed; top: 0; bottom: 0; - overflow-y: scroll; + overflow-y: auto; + overflow-x: hidden; left: 0; height: 100%; transition-duration: .3s; |