kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '26982-improve-pipeline-status-icon-linking-in-widgets' into 'master' 

Improve pipeline status icon linking in widgets

Closes #26982

See merge request !8705
This commit is contained in:
Annabel Dunstone Gray 2017-01-31 19:16:36 +00:00
parent d1ab9ad615 b61b45a759
commit 43c575acf3
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/stylesheets/framework/icons.scss
View File

@ -58,3 +58,9 @@
fill: $gl-text-color;
}
}
.icon-link {
&:hover {
text-decoration: none;
}
}

5
app/views/projects/commit/_commit_box.html.haml
View File

@ -63,9 +63,10 @@
- if @commit.status
.well-segment.pipeline-info
%div{ class: "icon-container ci-status-icon-#{@commit.status}" }
= ci_icon_for_status(@commit.status)
= link_to namespace_project_pipeline_path(@project.namespace, @project, @commit.pipelines.last.id) do
= ci_icon_for_status(@commit.status)
Pipeline
= link_to "##{@commit.pipelines.last.id}", pipelines_namespace_project_commit_path(@project.namespace, @project, @commit.id), class: "monospace"
= link_to "##{@commit.pipelines.last.id}", namespace_project_pipeline_path(@project.namespace, @project, @commit.pipelines.last.id), class: "monospace"
for
= link_to @commit.short_id, namespace_project_commit_path(@project.namespace, @project, @commit), class: "monospace"
%span.ci-status-label

3
app/views/projects/merge_requests/widget/_heading.html.haml
View File

@ -2,7 +2,8 @@
.mr-widget-heading
- %w[success success_with_warnings skipped canceled failed running pending].each do |status|
.ci_widget{ class: "ci-#{status} ci-status-icon-#{status}", style: ("display:none" unless @pipeline.status == status) }
= ci_icon_for_status(status)
= link_to namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'icon-link' do
= ci_icon_for_status(status)
%span
Pipeline
= link_to "##{@pipeline.id}", namespace_project_pipeline_path(@pipeline.project.namespace, @pipeline.project, @pipeline.id), class: 'pipeline'

4
app/views/projects/pipelines/_info.html.haml
View File

@ -23,8 +23,8 @@
.info-well
- if @commit.status
.well-segment.pipeline-info
%div{ class: "icon-container ci-status-icon-#{@commit.status}" }
= ci_icon_for_status(@commit.status)
.icon-container
= icon('clock-o')
= pluralize @pipeline.statuses.count(:id), "build"
- if @pipeline.ref
from

4
changelogs/unreleased/26982-improve-pipeline-status-icon-linking-in-widgets.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Improve pipeline status icon linking in widgets
merge_request:
author: