diff options
author | Mike Greiling <mike@pixelcog.com> | 2017-08-03 02:13:16 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2017-08-04 23:52:55 +0300 |
commit | 825224ba13c636ed92262d1c7a07e77bf5f98543 (patch) | |
tree | 3b7207b09b4183dc279399666244641b1e950f19 /app/assets | |
parent | f075e6d23d9b05acc6055ab8393d318a9d523088 (diff) |
remove nicescroll from wiki sidebar
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/wikis.js | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/wiki.scss | 12 |
2 files changed, 11 insertions, 3 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; } |