diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-13 19:14:38 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-12-13 19:14:38 +0000 |
| commit | 9d0fc98c7d36d4865cb719333b1bd3000b629978 (patch) | |
| tree | 67c17796d2cb5232432b7f94ff9b6b8b44d4c808 /app/views | |
| parent | 83998c0a33c70c786f48eef5ce723eb6dd76761f (diff) | |
| parent | a5439897d20b80274733605862d050b2abfb1cb3 (diff) | |
| download | gitlab-ce-9d0fc98c7d36d4865cb719333b1bd3000b629978.tar.gz | |
Merge branch '33926-update-issuable-icons' into 'master'
Update issuable status icons
Closes #33926
See merge request gitlab-org/gitlab-ce!15898
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_mr_title.html.haml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index d260aaee2d3..eab7879c7bf 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -14,12 +14,12 @@ .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") + .issuable-status-box.status-box.status-box-issue-closed{ class: issue_button_visibility(@issue, false) } + = sprite_icon('mobile-issue-close', size: 16, css_class: 'hidden-sm hidden-md hidden-lg') %span.hidden-xs Closed .issuable-status-box.status-box.status-box-open{ class: issue_button_visibility(@issue, true) } - = icon('circle-o', class: "hidden-sm hidden-md hidden-lg") + = sprite_icon('issue-open-m', size: 16, css_class: 'hidden-sm hidden-md hidden-lg') %span.hidden-xs Open .issuable-meta diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index bc91758110e..22c8b6b513d 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -7,7 +7,7 @@ .detail-page-header .detail-page-header-body .issuable-status-box.status-box{ class: status_box_class(@merge_request) } - = icon(@merge_request.state_icon_name, class: "hidden-sm hidden-md hidden-lg") + = sprite_icon(@merge_request.state_icon_name, size: 16, css_class: 'hidden-sm hidden-md hidden-lg') %span.hidden-xs = @merge_request.state_human_name |