diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-02-18 10:55:30 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-02-18 10:55:30 -0500 |
| commit | 71795b9ae8b21e796be73090bf96f66b953ad138 (patch) | |
| tree | c8e8581983e6f4e16bba6920abc46fae7968887c | |
| parent | c0f549a95bb66ef9f5a957949c72698db2b62169 (diff) | |
| download | gitlab-ce-71795b9ae8b21e796be73090bf96f66b953ad138.tar.gz | |
Uses cross browser niceScroll to do scrolling on sidebar.
| -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 |