Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
d2d0e38a3644
Commit
729cb3b3
authored
Oct 03, 2016
by
Fatih Acet
Browse files
Fixes sidebar navigation.
parent
5cc85b6e3c54
Changes
3
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/sidebar.js.es6
View file @
d2d0e38a
...
...
@@ -34,8 +34,8 @@
$(pageSelector).hasClass(expandedPageClass)
);
$(document)
.on('click', sidebarToggleSelector, (
e
) => this.toggleSidebar(
e
))
.on('click', pinnedToggleSelector, (
e
) => this.togglePinnedState(
e
))
.on('click', sidebarToggleSelector, () => this.toggleSidebar())
.on('click', pinnedToggleSelector, () => this.togglePinnedState())
.on('click', 'html, body', (e) => this.handleClickEvent(e))
.on('page:change', () => this.renderState());
this.renderState();
...
...
@@ -47,19 +47,17 @@
const targetIsToggle = $target.closest(sidebarToggleSelector).length > 0;
const targetIsSidebar = $target.closest(sidebarWrapperSelector).length > 0;
if (!targetIsToggle && (!targetIsSidebar || $target.closest('a'))) {
this.toggleSidebar(
e
);
this.toggleSidebar();
}
}
}
toggleSidebar(e) {
e.preventDefault();
toggleSidebar() {
this.isExpanded = !this.isExpanded;
this.renderState();
}
togglePinnedState(e) {
e.preventDefault();
togglePinnedState() {
this.isPinned = !this.isPinned;
if (!this.isPinned) {
this.isExpanded = false;
...
...
app/assets/stylesheets/framework/sidebar.scss
View file @
d2d0e38a
...
...
@@ -142,6 +142,7 @@
transition-duration
:
.3s
;
position
:
absolute
;
top
:
0
;
cursor
:
pointer
;
&
:hover
,
&
:focus
{
...
...
app/views/layouts/_page.html.haml
View file @
d2d0e38a
.page-with-sidebar
{
class:
"#{page_sidebar_class} #{page_gutter_class}"
}
.sidebar-wrapper.nicescroll
.sidebar-action-buttons
=
link_to
'#'
,
class:
'
nav-header-btn
toggle-nav-collapse
'
,
title:
"Open/Close"
do
.
nav-header-btn
.
toggle-nav-collapse
{
title:
"Open/Close"
}
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
=
link_to
'#'
,
class:
"nav-header-btn pin-nav-btn has-tooltip
#{
'is-active'
if
pinned_nav?
}
js-nav-pin"
,
title:
pinned_nav?
?
"Unpin navigation"
:
"Pin Navigation"
,
data:
{
placement:
'right'
,
container:
'body'
}
do
%div
{
class:
"nav-header-btn pin-nav-btn has-tooltip #{'is-active' if pinned_nav?} js-nav-pin"
,
title:
pinned_nav?
?
"Unpin navigation"
:
"Pin Navigation"
,
data:
{
placement:
'right'
,
container:
'body'
}
}
%span
.sr-only
Toggle navigation pinning
=
icon
(
'fw thumb-tack'
)
...
...
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