diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 12:29:57 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-14 12:29:57 +0200 |
| commit | 98cb6256faddf1dc862b38e8943bb25734d03e93 (patch) | |
| tree | 623de283a9c7f66fe7a6f1564921c73877cd8d14 /app | |
| parent | c013a9de148c7a4557c0ae80449ba4c7fbf2746b (diff) | |
| download | gitlab-ce-98cb6256faddf1dc862b38e8943bb25734d03e93.tar.gz | |
Add nice scroll for sidebar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/themes/gitlab-theme.scss | 1 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 |
3 files changed, 4 insertions, 2 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; diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index f17f6fdd91c..96e15783a36 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -1,6 +1,6 @@ .page-with-sidebar{ class: nav_sidebar_class } = render "layouts/broadcast" - .sidebar-wrapper + .sidebar-wrapper.nicescroll - if defined?(sidebar) && sidebar = render "layouts/nav/#{sidebar}" - elsif current_user |