diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 11:42:06 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-01-31 11:42:06 +0000 |
| commit | 5ac590677f4518d40070ba797874439dcf4a6227 (patch) | |
| tree | 5d3eadce64fb91771fa3a22c758a4635ea63c3d0 /app/views/ci | |
| parent | 810979f02b72f68b805b2e0c4a067b36e77334b6 (diff) | |
| parent | 10178af1fd30e97dd65d11bba1e640aa7dc5bbbd (diff) | |
| download | gitlab-ce-5ac590677f4518d40070ba797874439dcf4a6227.tar.gz | |
Merge branch '25910-convert-manual-action-icons-to-svg-to-propperly-position-them' into 'master'
Convert pipeline action icons to svg to have them propperly positioned
Closes #25910
See merge request !8766
Diffstat (limited to 'app/views/ci')
| -rw-r--r-- | app/views/ci/status/_dropdown_graph_badge.html.haml | 2 | ||||
| -rw-r--r-- | app/views/ci/status/_graph_badge.html.haml | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/views/ci/status/_dropdown_graph_badge.html.haml b/app/views/ci/status/_dropdown_graph_badge.html.haml index 8dea3479f82..8ed23ac4919 100644 --- a/app/views/ci/status/_dropdown_graph_badge.html.haml +++ b/app/views/ci/status/_dropdown_graph_badge.html.haml @@ -16,4 +16,4 @@ - if status.has_action? = link_to status.action_path, class: 'ci-action-icon-wrapper js-ci-action-icon', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do - = icon(status.action_icon, class: status.action_class) + = custom_icon(status.action_icon) diff --git a/app/views/ci/status/_graph_badge.html.haml b/app/views/ci/status/_graph_badge.html.haml index dd2f649de9a..0530d21a7e2 100644 --- a/app/views/ci/status/_graph_badge.html.haml +++ b/app/views/ci/status/_graph_badge.html.haml @@ -2,7 +2,7 @@ - subject = local_assigns.fetch(:subject) - status = subject.detailed_status(current_user) -- klass = "ci-status-icon ci-status-icon-#{status.group}" +- klass = "ci-status-icon ci-status-icon-#{status.group} js-ci-status-icon-#{status.group}" - tooltip = "#{subject.name} - #{status.label}" - if status.has_details? @@ -16,5 +16,5 @@ - if status.has_action? = link_to status.action_path, class: 'ci-action-icon-container has-tooltip', method: status.action_method, data: { toggle: 'tooltip', title: status.action_title } do - %i.ci-action-icon-wrapper - = icon(status.action_icon, class: status.action_class) + %i.ci-action-icon-wrapper{ class: "js-#{status.action_icon.dasherize}" } + = custom_icon(status.action_icon) |