Commit 0983d01b authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Remove stage names; connect stages in column

parent 1038ef54
...@@ -155,6 +155,30 @@ ...@@ -155,6 +155,30 @@
vertical-align: middle; vertical-align: middle;
overflow: visible; overflow: visible;
} }
.stage-container {
display: inline-block;
position: relative;
margin-right: 6px;
&:not(:last-child) {
&::after {
content: '';
height: 20px;
width: 9px;
position: absolute;;
right: -9px;
bottom: 36%;
border-bottom: 2px solid $white-dark;
}
}
}
.stage-empty {
g {
fill: $white-normal;
}
}
} }
.duration, .duration,
......
...@@ -36,16 +36,17 @@ ...@@ -36,16 +36,17 @@
- stages_status = pipeline.statuses.relevant.latest.stages_status - stages_status = pipeline.statuses.relevant.latest.stages_status
- stages.each do |stage| %td.stage-cell
%td.stage-cell - stages.each do |stage|
- status = stages_status[stage] - status = stages_status[stage]
- tooltip = "#{stage.titleize}: #{status || 'not found'}" - tooltip = "#{stage.titleize}: #{status || 'not found'}"
- if status .stage-container
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do - if status
= ci_icon_for_status(status) = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, anchor: stage), class: "has-tooltip ci-status-icon-#{status}", title: tooltip do
- else = ci_icon_for_status(status)
.light.has-tooltip{ title: tooltip } - else
\- .light.has-tooltip{ title: tooltip }
= custom_icon('icon_stage_empty')
%td %td
- if pipeline.duration - if pipeline.duration
......
...@@ -47,13 +47,14 @@ ...@@ -47,13 +47,14 @@
%tbody %tbody
%th Status %th Status
%th Commit %th Commit
- stages.each do |stage| %th Stages
%th.stage -# - stages.each do |stage|
- if stage.titleize.length > 12 -# %th.stage
%span.has-tooltip{ title: "#{stage.titleize}" } -# - if stage.titleize.length > 12
= stage.titleize -# %span.has-tooltip{ title: "#{stage.titleize}" }
- else -# = stage.titleize
= stage.titleize -# - else
-# = stage.titleize
%th %th
%th %th
= render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
......
<svg width="14px" class="stage-empty" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="_icon_status_created" fill="#000000">
<path d="M12.5,7 C12.5,4 10,1.5 7,1.5 C4,1.5 1.5,4 1.5,7 C1.5,10 4,12.5 7,12.5 C10,12.5 12.5,10 12.5,7 L12.5,7 L12.5,7 Z M0,7 C0,3.1 3.1,0 7,0 C10.9,0 14,3.1 14,7 C14,10.9 10.9,14 7,14 C3.1,14 0,10.9 0,7 L0,7 L0,7 Z" id="Shape"></path>
</g>
</g>
</svg>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment