diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 13:48:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 13:48:21 +0300 |
| commit | 2280cb23d4f9ecbf732b06a94c044ce673562be3 (patch) | |
| tree | a15245ff98bbb74f3237e95a45b1504e8c797c7b /app/assets | |
| parent | 77216386be94dae90b51622f3cb917cc7ab6145b (diff) | |
| parent | 98cb6256faddf1dc862b38e8943bb25734d03e93 (diff) | |
Merge branch 'nice-scroll-sidebar' into 'master'
Add nice scroll for sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !978
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/gitlab-theme.scss | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index bb120424ccf..8b041c490d8 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -40,6 +40,7 @@ #= require shortcuts_issuable #= require shortcuts_network #= require cal-heatmap +#= require jquery.nicescroll.min #= require_tree . window.slugify = (text) -> @@ -104,6 +105,8 @@ if location.hash window.addEventListener "hashchange", shiftWindow $ -> + $(".nicescroll").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF") + # Click a .js-select-on-focus field, select the contents $(".js-select-on-focus").on "focusin", -> # Prevent a mouseup event from deselecting the input diff --git a/app/assets/stylesheets/themes/gitlab-theme.scss b/app/assets/stylesheets/themes/gitlab-theme.scss index e5325bbdc74..3589cb88d03 100644 --- a/app/assets/stylesheets/themes/gitlab-theme.scss +++ b/app/assets/stylesheets/themes/gitlab-theme.scss @@ -35,7 +35,6 @@ .sidebar-wrapper { background: $color-darker; - border-right: 1px solid $color-darker; .sidebar-user { background: $color-darker; |