diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-02-18 16:42:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-18 17:57:06 +0100 |
| commit | 765589197299471b2c8d455a0ca76d433b588c2d (patch) | |
| tree | 706424addd23d0d0d29a959af4ae8bf110050c9a | |
| parent | df2056972730a9043068e4c167f2f2fc4de776b3 (diff) | |
| download | gitlab-ce-765589197299471b2c8d455a0ca76d433b588c2d.tar.gz | |
Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master'
Uses cross browser niceScroll to do scrolling on sidebar.
Fixes: #13544
Firefox does not support `-webkit-scrollbar` and there is no alternative for FF. So for example Gmail falls back to no fancy scrollbar. Stuck with jQuery, which is a good solution, since we already use it.
This also leaves the default scrollbar as is.
Also fixes horz scroll issue:
cc @creamzy @dzaporozhets
See merge request !2873
| -rw-r--r-- | app/assets/javascripts/issuable_context.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/gitlab-theme.scss | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/app/assets/javascripts/issuable_context.js.coffee b/app/assets/javascripts/issuable_context.js.coffee index d17b1123418..e52b73f94f6 100644 --- a/app/assets/javascripts/issuable_context.js.coffee +++ b/app/assets/javascripts/issuable_context.js.coffee @@ -15,3 +15,5 @@ class @IssuableContext block.find('.selectbox').show() block.find('.value').hide() block.find('.js-select2').select2("open") + + $(".right-sidebar").niceScroll() diff --git a/app/assets/stylesheets/framework/gitlab-theme.scss b/app/assets/stylesheets/framework/gitlab-theme.scss index 0f68582e447..12cef6f8ea1 100644 --- a/app/assets/stylesheets/framework/gitlab-theme.scss +++ b/app/assets/stylesheets/framework/gitlab-theme.scss @@ -117,20 +117,4 @@ body { &.ui_violet { @include gitlab-theme(#9988CC, $theme-violet, #443366, #332255); } -} - -::-webkit-scrollbar{ - width: 3px; -} - -::-webkit-scrollbar-thumb{ - background-color:$theme-charcoal; border-radius: 0; -} - -::-webkit-scrollbar-thumb:hover{ - background-color:$theme-charcoal; -} - -::-webkit-scrollbar-track{ - background-color:#FFF; }
\ No newline at end of file |