Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
cc8ad60f
Commit
cc8ad60f
authored
8 years ago
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update pipeline graph styles to match mockup
parent
4c8ea149
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
15 deletions
+30
-15
app/assets/javascripts/pipeline.js.es6
app/assets/javascripts/pipeline.js.es6
+9
-0
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+21
-15
No files found.
app/assets/javascripts/pipeline.js.es6
View file @
cc8ad60f
(function() {
function addMarginToBuild () {
const $secondChild = $('.build:nth-child(2)');
if ($secondChild.length) {
$secondChild.closest('.stage-column').addClass('left-margin');
}
}
function toggleGraph() {
const $pipelineBtn = $(this).closest('.toggle-pipeline-btn');
const $pipelineGraph = $(this).closest('.row-content-block').next('.pipeline-graph');
...
...
@@ -21,4 +29,5 @@
}
$(document).on('click', '.toggle-pipeline-btn', toggleGraph);
$(document).on('ready', addMarginToBuild);
})();
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/pipelines.scss
View file @
cc8ad60f
...
...
@@ -303,7 +303,13 @@
.stage-column
{
display
:
inline-block
;
vertical-align
:
top
;
margin-right
:
65px
;
margin-right
:
48px
;
&
.left-margin
{
&
:not
(
:first-child
)
{
margin-left
:
48px
;
}
}
li
{
list-style
:
none
;
...
...
@@ -321,9 +327,9 @@
.build
{
border
:
1px
solid
$border-color
;
position
:
relative
;
padding
:
6
px
10px
;
padding
:
8
px
10px
;
border-radius
:
30px
;
width
:
1
50
px
;
width
:
1
86
px
;
margin-bottom
:
10px
;
&
.playable
{
...
...
@@ -443,9 +449,9 @@
content
:
''
;
position
:
absolute
;
top
:
50%
;
right
:
-
69
px
;
right
:
-
48
px
;
border-top
:
2px
solid
$border-color
;
width
:
69
px
;
width
:
48
px
;
height
:
1px
;
}
}
...
...
@@ -457,22 +463,22 @@
top
:
-47px
;
position
:
absolute
;
border-bottom
:
2px
solid
$border-color
;
width
:
2
0
px
;
width
:
2
5
px
;
height
:
65px
;
}
// Right connecting curves
&
:
:
after
{
right
:
-2
0
px
;
right
:
-2
5
px
;
border-right
:
2px
solid
$border-color
;
border-radius
:
0
0
15
px
;
border-radius
:
0
0
20
px
;
}
// Left connecting curves
&
:
:
before
{
left
:
-2
0
px
;
left
:
-2
5
px
;
border-left
:
2px
solid
$border-color
;
border-radius
:
0
0
0
15
px
;
border-radius
:
0
0
0
20
px
;
}
}
...
...
@@ -538,20 +544,20 @@
width
:
21px
;
height
:
25px
;
position
:
absolute
;
top
:
-
29
px
;
top
:
-
30
px
;
border-top
:
2px
solid
$border-color
;
}
&
:
:
after
{
left
:
-
39
px
;
left
:
-
44
px
;
border-right
:
2px
solid
$border-color
;
border-radius
:
0
15
px
;
border-radius
:
0
20
px
;
}
&
:
:
before
{
right
:
-
39
px
;
right
:
-
44
px
;
border-left
:
2px
solid
$border-color
;
border-radius
:
15
px
0
0
;
border-radius
:
20
px
0
0
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
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