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
d4da9ae78cae
Commit
fedc8adf
authored
Aug 17, 2017
by
Phil Hughes
Browse files
Merge branch 'fix-milestone-sidebar' into 'master'
Fix milestone sidebar collapse button Closes #36453 See merge request !13620
parents
f32832c8659b
327f1707e92d
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/assets/stylesheets/pages/issuable.scss
View file @
d4da9ae7
...
...
@@ -260,7 +260,7 @@
padding-top
:
10px
;
}
&
:not
(
.issue-boards-sidebar
)
:not
([
data-signed-in
])
{
&
:not
(
.issue-boards-sidebar
)
:not
([
data-signed-in
])
:not
([
data-always-show-toggle
])
{
.issuable-sidebar-header
{
display
:
none
;
}
...
...
app/views/shared/milestones/_sidebar.html.haml
View file @
d4da9ae7
-
affix_offset
=
local_assigns
.
fetch
(
:affix_offset
,
"50"
)
-
project
=
local_assigns
[
:project
]
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
affix_offset
,
"spy"
=>
"affix"
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
%aside
.right-sidebar.js-right-sidebar
{
data:
{
"offset-top"
=>
affix_offset
,
"spy"
=>
"affix"
,
"always-show-toggle"
=>
true
},
class:
sidebar_gutter_collapsed_class
,
'aria-live'
=>
'polite'
}
.issuable-sidebar.milestone-sidebar
.block.milestone-progress.issuable-sidebar-header
%a
.gutter-toggle.pull-right.js-sidebar-toggle
{
role:
"button"
,
href:
"#"
,
"aria-label"
=>
"Toggle sidebar"
}
...
...
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