BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
83c1ce74
Commit
83c1ce74
authored
Aug 09, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Connect all builds in visual pipeline
parent
dcb7d414
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
90 additions
and
23 deletions
+90
-23
pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+73
-8
_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+17
-15
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
83c1ce74
...
@@ -234,6 +234,10 @@
...
@@ -234,6 +234,10 @@
.pipeline-visualization
{
.pipeline-visualization
{
position
:
relative
;
position
:
relative
;
ul
{
padding
:
0
;
}
}
}
.stage-column
{
.stage-column
{
...
@@ -241,15 +245,15 @@
...
@@ -241,15 +245,15 @@
vertical-align
:
top
;
vertical-align
:
top
;
margin-right
:
40px
;
margin-right
:
40px
;
li
{
list-style
:
none
;
}
.stage-name
{
.stage-name
{
margin-bottom
:
15px
;
margin-bottom
:
15px
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.builds-container
{
}
.build
{
.build
{
border
:
1px
solid
$border-color
;
border
:
1px
solid
$border-color
;
position
:
relative
;
position
:
relative
;
...
@@ -268,20 +272,81 @@
...
@@ -268,20 +272,81 @@
margin-right
:
5px
;
margin-right
:
5px
;
}
}
// Connect first build in each stage with right horizontal line
&
:first-child
{
&
:first-child
{
&
:
:
after
,
&::
before
{
&
:
:
after
{
content
:
''
;
content
:
''
;
position
:
absolute
;
position
:
absolute
;
top
:
50%
;
top
:
50%
;
right
:
-44px
;
right
:
-44px
;
border-top
:
1
px
solid
$border-color
;
border-top
:
2
px
solid
$border-color
;
width
:
44px
;
width
:
44px
;
height
:
1px
;
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
;
}
}
}
}
}
}
}
app/views/projects/commit/_pipeline.html.haml
View file @
83c1ce74
.row-content-block.white
.row-content-block.white
.pipeline-visualization
.pipeline-visualization
-
pipeline
.
statuses
.
stages
.
each
do
|
stage
|
%ul
.stage-column-list
-
statuses
=
pipeline
.
statuses
.
where
(
stage:
stage
)
-
pipeline
.
statuses
.
stages
.
each
do
|
stage
|
-
status
=
statuses
.
latest
.
status
-
statuses
=
pipeline
.
statuses
.
where
(
stage:
stage
)
.stage-column
-
status
=
statuses
.
latest
.
status
.stage-name
%li
.stage-column
%a
{
name:
stage
}
.stage-name
-
if
stage
%a
{
name:
stage
}
=
stage
.
titleize
-
if
stage
.builds-container
=
stage
.
titleize
-
statuses
.
each
do
|
build
|
.builds-container
.build
%ul
%span
{
class:
"ci-status-link ci-status-icon-#{status}"
}
-
statuses
.
each
do
|
build
|
=
ci_icon_for_status
(
status
)
%li
.build
=
build
.
name
%span
{
class:
"ci-status-link ci-status-icon-#{status}"
}
=
ci_icon_for_status
(
status
)
=
build
.
name
.row-content-block.build-content.middle-block
.row-content-block.build-content.middle-block
.pull-right
.pull-right
...
@@ -52,7 +54,7 @@
...
@@ -52,7 +54,7 @@
-
if
pipeline
.
project
.
builds_enabled?
&&
!
pipeline
.
ci_yaml_file
-
if
pipeline
.
project
.
builds_enabled?
&&
!
pipeline
.
ci_yaml_file
.bs-callout.bs-callout-warning
.bs-callout.bs-callout-warning
\.gitlab-ci.yml not found in this commit
\.gitlab-ci.yml not found in this commit
-#
-# .table-holder.pipeline-holder
-# .table-holder.pipeline-holder
-# %table.table.builds.pipeline
-# %table.table.builds.pipeline
-# %thead
-# %thead
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment