diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-25 12:48:15 -0500 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-08-26 09:02:17 -0500 |
| commit | 770ecd55dd7fa483e440386a6635c2833c5239c1 (patch) | |
| tree | 050671efa998830f7d56eee1aa919eaf5cd02c45 | |
| parent | 6e584f46d2479d5550c12293af00fd494b60f2c0 (diff) | |
| download | gitlab-ce-770ecd55dd7fa483e440386a6635c2833c5239c1.tar.gz | |
Curved lines at top of pipeline graph
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 46 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build_pipeline.html.haml | 1 |
2 files changed, 45 insertions, 2 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index 9bdf0d250bb..9b7bf9575ff 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -370,8 +370,11 @@ // Connect second build to first build with smaller curved line &:nth-child(2) { &::after, &::before { - height: 45px; - top: -26px; + height: 29px; + top: -10px; + } + .curve { + display: block; } } } @@ -390,6 +393,12 @@ border: none; } } + // Remove opposite curve + .curve { + &::before { + display: none; + } + } } } @@ -401,6 +410,39 @@ border: none; } } + // Remove opposite curve + .curve { + &::after { + display: none; + } + } + } + } + + // Curve first child connecting lines in opposite direction + .curve { + display: none; + + &::before, + &::after { + content: ''; + width: 21px; + height: 25px; + position: absolute; + top: -28.5px; + border-top: 2px solid $border-color; + } + + &::after { + left: -39px; + border-right: 2px solid $border-color; + border-radius: 0 50% 0; + } + + &::before { + right: -39px; + border-left: 2px solid $border-color; + border-radius: 50% 0 0; } } } diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml index 04cbd0c3591..ebdf60ae370 100644 --- a/app/views/projects/ci/builds/_build_pipeline.html.haml +++ b/app/views/projects/ci/builds/_build_pipeline.html.haml @@ -1,5 +1,6 @@ - is_playable = subject.playable? && can?(current_user, :update_build, @project) %li.build{class: ("playable" if is_playable)} + .curve .build-content - if is_playable = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do |