summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-09 14:26:25 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-08-16 15:30:05 -0500
commitca9bba29fea30fd4cdb223273fca007c9abf12b0 (patch)
tree002c08292ca0ecd35623b7957c001018d84b9d0b
parentdfe94da0fb4da1a84bfd6324f7b2291067582af0 (diff)
downloadgitlab-ce-ca9bba29fea30fd4cdb223273fca007c9abf12b0.tar.gz
Connect all builds in visual pipeline
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss81
1 files changed, 73 insertions, 8 deletions
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index e79c7e59720..fa422f4f3c5 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -234,6 +234,10 @@
.pipeline-visualization {
position: relative;
+
+ ul {
+ padding: 0;
+ }
}
.stage-column {
@@ -241,15 +245,15 @@
vertical-align: top;
margin-right: 40px;
+ li {
+ list-style: none;
+ }
+
.stage-name {
margin-bottom: 15px;
font-weight: bold;
}
- .builds-container {
-
- }
-
.build {
border: 1px solid $border-color;
position: relative;
@@ -268,20 +272,81 @@
margin-right: 5px;
}
+ // Connect first build in each stage with right horizontal line
&:first-child {
- &::after, &::before {
+ &::after {
content: '';
position: absolute;
top: 50%;
right: -44px;
- border-top: 1px solid $border-color;
+ border-top: 2px solid $border-color;
width: 44px;
height: 1px;
}
}
- &:first-child::before, &:last-child::after{
- border: 0 none;
+
+ // Connect each build (except for first) with curved lines
+ &:not(:first-child) {
+ &::after, &::before {
+ content: '';
+ top: -47px;
+ position: absolute;
+ border-bottom: 2px solid $border-color;
+ width: 20px;
+ height: 65px;
+ }
+
+ // Right connecting curves
+ &::after {
+ right: -21px;
+ border-right: 2px solid $border-color;
+ border-radius: 0 0 50px 0;
+ -webkit-border-radius: 0 0 50px 0;
+ }
+
+ // Left connecting curves
+ &::before {
+ left: -21px;
+ border-left: 2px solid $border-color;
+ border-radius: 0 0 0 50px;
+ -webkit-border-radius: 0 0 0 50px;
+ }
+ }
+
+ // Connect second build to first build with smaller curved line
+ &:nth-child(2) {
+ &::after, &::before {
+ height: 40px;
+ top: -26px;
+ }
+ }
+ }
+
+ &:last-child {
+ .build {
+ // Remove right connecting horizontal line from first build in last stage
+ &:first-child {
+ &::after, &::before {
+ border: none;
+ }
+ }
+ // Remove right curved connectors from all builds in last stage
+ &:not(:first-child) {
+ &::after {
+ border: none;
+ }
+ }
}
+ }
+ &:first-child {
+ .build {
+ // Remove left curved connectors from all builds in first stage
+ &:not(:first-child) {
+ &::before {
+ border: none;
+ }
+ }
+ }
}
}