BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
825224ba
Commit
825224ba
authored
Aug 02, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove nicescroll from wiki sidebar
parent
f075e6d2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
18 deletions
+27
-18
wikis.js
app/assets/javascripts/wikis.js
+0
-2
wiki.scss
app/assets/stylesheets/pages/wiki.scss
+11
-1
_sidebar.html.haml
app/views/projects/wikis/_sidebar.html.haml
+16
-15
No files found.
app/assets/javascripts/wikis.js
View file @
825224ba
/* 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
)
{
...
...
app/assets/stylesheets/pages/wiki.scss
View file @
825224ba
...
...
@@ -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
;
}
...
...
app/views/projects/wikis/_sidebar.html.haml
View file @
825224ba
%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'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment