diff options
| author | Phil Hughes <me@iamphill.com> | 2017-08-17 08:12:48 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-08-17 08:12:48 +0000 |
| commit | fedc8adf90df57e083c1a30a0798d539b84eecb7 (patch) | |
| tree | 1ff31d00472bbe9c37c852c76888ceeff9619533 | |
| parent | 36ba84cb94dd377a9995b5cdaba9021974fc0489 (diff) | |
| parent | ab226ba1689de4b73c92c6895445f76e5babb278 (diff) | |
| download | gitlab-ce-fedc8adf90df57e083c1a30a0798d539b84eecb7.tar.gz | |
Merge branch 'fix-milestone-sidebar' into 'master'
Fix milestone sidebar collapse button
Closes #36453
See merge request !13620
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 1dac38f2b6d..49839a9b528 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -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; } diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index 66ac8196f2f..40379f48393 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -1,7 +1,7 @@ - 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" } |