remove nicescroll from wiki sidebar
This commit is contained in:
parent
f075e6d23d
commit
825224ba13
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 ' ' 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 ' ' 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'
|
||||
|
|
Loading…
Reference in New Issue