diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-14 10:54:01 +0200 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-09-16 09:24:48 +0200 |
| commit | 39bce58bd6168b37252350f13e64a54f2d645d5e (patch) | |
| tree | 4523ba7355e1a0899142e3ce3ba24ff229e46568 | |
| parent | 7ec9c20df19a63b6111e59549218ec19132d0a61 (diff) | |
| download | gitlab-ce-39bce58bd6168b37252350f13e64a54f2d645d5e.tar.gz | |
Remove empty stage state; fit tooltip on one line
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 12 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/pipelines/index.html.haml | 7 | ||||
| -rw-r--r-- | app/views/shared/icons/_icon_stage_empty.svg | 7 |
4 files changed, 7 insertions, 26 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index a792b60f89a..bf801a8845f 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -160,6 +160,10 @@ position: relative; margin-right: 6px; + .tooltip { + white-space: nowrap; + } + &:not(:last-child) { &::after { content: ''; @@ -168,16 +172,10 @@ position: absolute;; right: -9px; bottom: 36%; - border-bottom: 2px solid $white-dark; + border-bottom: 3px solid $table-text-gray; } } } - - .stage-empty { - g { - fill: $white-normal; - } - } } .duration, diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index 9b8aa57a9dc..6391c67021b 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -40,13 +40,10 @@ - stages.each do |stage| - status = stages_status[stage] - 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 = ci_icon_for_status(status) - - else - .light.has-tooltip{ title: tooltip } - = custom_icon('icon_stage_empty') %td - if pipeline.duration diff --git a/app/views/projects/pipelines/index.html.haml b/app/views/projects/pipelines/index.html.haml index 0c784f626a9..faf28db68d1 100644 --- a/app/views/projects/pipelines/index.html.haml +++ b/app/views/projects/pipelines/index.html.haml @@ -48,13 +48,6 @@ %th Status %th Commit %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 = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages diff --git a/app/views/shared/icons/_icon_stage_empty.svg b/app/views/shared/icons/_icon_stage_empty.svg deleted file mode 100644 index c317033b625..00000000000 --- a/app/views/shared/icons/_icon_stage_empty.svg +++ /dev/null @@ -1,7 +0,0 @@ -<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> |
