Commit 39bce58b authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Remove empty stage state; fit tooltip on one line

parent 7ec9c20d
...@@ -160,6 +160,10 @@ ...@@ -160,6 +160,10 @@
position: relative; position: relative;
margin-right: 6px; margin-right: 6px;
.tooltip {
white-space: nowrap;
}
&:not(:last-child) { &:not(:last-child) {
&::after { &::after {
content: ''; content: '';
...@@ -168,16 +172,10 @@ ...@@ -168,16 +172,10 @@
position: absolute;; position: absolute;;
right: -9px; right: -9px;
bottom: 36%; bottom: 36%;
border-bottom: 2px solid $white-dark; border-bottom: 3px solid $table-text-gray;
} }
} }
} }
.stage-empty {
g {
fill: $white-normal;
}
}
} }
.duration, .duration,
......
...@@ -40,13 +40,10 @@ ...@@ -40,13 +40,10 @@
- stages.each do |stage| - stages.each do |stage|
- status = stages_status[stage] - status = stages_status[stage]
- tooltip = "#{stage.titleize}: #{status || 'not found'}" - tooltip = "#{stage.titleize}: #{status || 'not found'}"
.stage-container
- if status - 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 = 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
= ci_icon_for_status(status) = ci_icon_for_status(status)
- else
.light.has-tooltip{ title: tooltip }
= custom_icon('icon_stage_empty')
%td %td
- if pipeline.duration - if pipeline.duration
......
...@@ -48,13 +48,6 @@ ...@@ -48,13 +48,6 @@
%th Status %th Status
%th Commit %th Commit
%th Stages %th Stages
-# - stages.each do |stage|
-# %th.stage
-# - if stage.titleize.length > 12
-# %span.has-tooltip{ title: "#{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