diff options
| author | Eric Eastwood <contact@ericeastwood.com> | 2017-11-28 15:35:01 -0600 |
|---|---|---|
| committer | Eric Eastwood <contact@ericeastwood.com> | 2017-12-05 16:05:45 -0600 |
| commit | 6d61b4046b976400bb242f85034c06f69acbff51 (patch) | |
| tree | a519885d19bd1e80574fd5a6441e90546dfea538 /app/views/projects/issues | |
| parent | ca95ee6264325efdd62890c320f8dd4b40657432 (diff) | |
| download | gitlab-ce-6d61b4046b976400bb242f85034c06f69acbff51.tar.gz | |
Generalize detail page headers40543-generalize-detail-page-headers
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/40543
Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15192
Diffstat (limited to 'app/views/projects/issues')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index 48410ffee21..431d5a58daf 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -12,8 +12,8 @@ - can_update_issue = can?(current_user, :update_issue, @issue) - can_report_spam = @issue.submittable_as_spam_by?(current_user) -.clearfix.detail-page-header - .issuable-header +.detail-page-header + .detail-page-header-body .issuable-status-box.status-box.status-box-closed{ class: issue_button_visibility(@issue, false) } = icon('check', class: "hidden-sm hidden-md hidden-lg") %span.hidden-xs @@ -22,9 +22,6 @@ = icon('circle-o', class: "hidden-sm hidden-md hidden-lg") %span.hidden-xs Open - %a.btn.btn-default.pull-right.visible-xs-block.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" } - = icon('angle-double-left') - .issuable-meta - if @issue.confidential .issuable-warning-icon.inline= sprite_icon('eye-slash', size: 16, css_class: 'icon') @@ -32,7 +29,10 @@ .issuable-warning-icon.inline= sprite_icon('lock', size: 16, css_class: 'icon') = issuable_meta(@issue, @project, "Issue") - .issuable-actions.js-issuable-actions + %a.btn.btn-default.pull-right.visible-xs-block.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle{ href: "#" } + = icon('angle-double-left') + + .detail-page-header-actions.js-issuable-actions .clearfix.issue-btn-group.dropdown %button.btn.btn-default.pull-left.hidden-md.hidden-lg{ type: "button", data: { toggle: "dropdown" } } Options |