From 825224ba13c636ed92262d1c7a07e77bf5f98543 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 2 Aug 2017 18:13:16 -0500
Subject: [PATCH] remove nicescroll from wiki sidebar

---
 app/assets/javascripts/wikis.js             |  2 --
 app/assets/stylesheets/pages/wiki.scss      | 12 +++++++-
 app/views/projects/wikis/_sidebar.html.haml | 31 +++++++++++----------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/wikis.js b/app/assets/javascripts/wikis.js
index 00676bcb0b3..51ed2b4fd15 100644
--- a/app/assets/javascripts/wikis.js
+++ b/app/assets/javascripts/wikis.js
@@ -1,6 +1,5 @@
 /* global Breakpoints */
 
-import 'vendor/jquery.nicescroll';
 import './breakpoints';
 
 export default class Wikis {
@@ -8,7 +7,6 @@ export default class Wikis {
     this.bp = Breakpoints.get();
     this.sidebarEl = document.querySelector('.js-wiki-sidebar');
     this.sidebarExpanded = false;
-    $(this.sidebarEl).niceScroll();
 
     const sidebarToggles = document.querySelectorAll('.js-sidebar-wiki-toggle');
     for (let i = 0; i < sidebarToggles.length; i += 1) {
diff --git a/app/assets/stylesheets/pages/wiki.scss b/app/assets/stylesheets/pages/wiki.scss
index 45c21c5d274..fa6bdd297eb 100644
--- a/app/assets/stylesheets/pages/wiki.scss
+++ b/app/assets/stylesheets/pages/wiki.scss
@@ -95,12 +95,22 @@
 }
 
 .right-sidebar.wiki-sidebar {
-  padding: $gl-padding 0;
+  padding: 0;
 
   &.right-sidebar-collapsed {
     display: none;
   }
 
+  .sidebar-container {
+    padding: $gl-padding 0;
+    width: calc(100% + 100px);
+    padding-right: 100px;
+    height: 100%;
+    overflow-y: scroll;
+    overflow-x: hidden;
+    -webkit-overflow-scrolling: touch;
+  }
+
   .blocks-container {
     padding: 0 $gl-padding;
   }
diff --git a/app/views/projects/wikis/_sidebar.html.haml b/app/views/projects/wikis/_sidebar.html.haml
index e71ce1f357f..f7283ae4739 100644
--- a/app/views/projects/wikis/_sidebar.html.haml
+++ b/app/views/projects/wikis/_sidebar.html.haml
@@ -1,21 +1,22 @@
 %aside.right-sidebar.right-sidebar-expanded.wiki-sidebar.js-wiki-sidebar.js-right-sidebar{ data: { "offset-top" => "50", "spy" => "affix" } }
-  .block.wiki-sidebar-header.append-bottom-default
-    %a.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-wiki-toggle{ href: "#" }
-      = icon('angle-double-right')
+  .sidebar-container
+    .block.wiki-sidebar-header.append-bottom-default
+      %a.gutter-toggle.pull-right.visible-xs-block.visible-sm-block.js-sidebar-wiki-toggle{ href: "#" }
+        = icon('angle-double-right')
 
-    - git_access_url = project_wikis_git_access_path(@project)
-    = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '' do
-      = succeed '&nbsp;' do
-        = icon('cloud-download')
-      Clone repository
+      - git_access_url = project_wikis_git_access_path(@project)
+      = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '' do
+        = succeed '&nbsp;' do
+          = icon('cloud-download')
+        Clone repository
 
-  .blocks-container
-    .block.block-first
-      %ul.wiki-pages
-        = render @sidebar_wiki_entries, context: 'sidebar'
+    .blocks-container
+      .block.block-first
+        %ul.wiki-pages
+          = render @sidebar_wiki_entries, context: 'sidebar'
 
-    .block
-      = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do
-        More Pages
+      .block
+        = link_to project_wikis_pages_path(@project), class: 'btn btn-block' do
+          More Pages
 
 = render 'projects/wikis/new'
-- 
GitLab