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
Boxiang Sun
gitlab-ce
Commits
2c835eec
Commit
2c835eec
authored
Apr 19, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renders json endpoint + updates CSS to render the same between pipelines table and pipeline graph
parent
fd972f9f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
98 additions
and
47 deletions
+98
-47
app/assets/javascripts/mini_pipeline_graph_dropdown.js
app/assets/javascripts/mini_pipeline_graph_dropdown.js
+1
-3
app/assets/javascripts/pipelines/components/stage.vue
app/assets/javascripts/pipelines/components/stage.vue
+1
-0
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+2
-0
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+93
-44
app/views/shared/_mini_pipeline_graph.html.haml
app/views/shared/_mini_pipeline_graph.html.haml
+1
-0
No files found.
app/assets/javascripts/mini_pipeline_graph_dropdown.js
View file @
2c835eec
/* eslint-disable no-new */
import
$
from
'
jquery
'
;
import
flash
from
'
./flash
'
;
import
axios
from
'
./lib/utils/axios_utils
'
;
...
...
@@ -62,7 +60,7 @@ export default class MiniPipelineGraph {
*/
renderBuildsList
(
stageContainer
,
data
)
{
const
dropdownContainer
=
stageContainer
.
parentElement
.
querySelector
(
`
${
this
.
dropdownListSelector
}
.js-builds-dropdown-list`
,
`
${
this
.
dropdownListSelector
}
.js-builds-dropdown-list
ul
`
,
);
dropdownContainer
.
innerHTML
=
data
;
...
...
app/assets/javascripts/pipelines/components/stage.vue
View file @
2c835eec
...
...
@@ -95,6 +95,7 @@
axios
.
get
(
this
.
stage
.
dropdown_path
)
.
then
(({
data
})
=>
{
// TODO: REMOVE THIS ONCE WE HAVE BACKEND
this
.
dropdownContent
=
[
{
id
:
966
,
...
...
app/assets/stylesheets/framework/variables.scss
View file @
2c835eec
...
...
@@ -686,6 +686,8 @@ $stage-hover-bg: $gray-darker;
$ci-action-icon-size
:
22px
;
$pipeline-dropdown-line-height
:
20px
;
$pipeline-dropdown-status-icon-size
:
18px
;
$ci-action-dropdown-button-size
:
24px
;
$ci-action-dropdown-svg-size
:
12px
;
/*
CI variable lists
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
2c835eec
...
...
@@ -462,61 +462,61 @@
text-overflow
:
ellipsis
;
}
.build
{
position
:
relative
;
width
:
186px
;
margin-bottom
:
10px
;
white-space
:
normal
;
.ci-job-dropdown-container
{
// override dropdown.scss
.dropdown-menu
li
button
{
padding
:
0
;
text-align
:
center
;
}
}
// ensure .build-content has hover style when action-icon is hovered
.ci-job-dropdown-container
:hover
.build-content
{
@extend
.build-content
:hover
;
.ci-job-dropdown-container
{
// override dropdown.scss
.dropdown-menu
li
button
{
padding
:
0
;
text-align
:
center
;
}
}
.ci-action-icon-container
{
position
:
absolute
;
right
:
5px
;
top
:
5px
;
// Action Icons in big pipeline-graph nodes
&
.ci-action-icon-wrapper
{
height
:
30px
;
width
:
30px
;
background
:
$white-light
;
border
:
1px
solid
$border-color
;
border-radius
:
100%
;
display
:
block
;
.ci-action-icon-container
{
position
:
absolute
;
right
:
5px
;
top
:
5px
;
&
:hover
{
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$dropdown-toggle-active-border-color
;
// Action Icons in big pipeline-graph nodes
&
.ci-action-icon-wrapper
{
height
:
30px
;
width
:
30px
;
background
:
$white-light
;
border
:
1px
solid
$border-color
;
border-radius
:
100%
;
display
:
block
;
svg
{
fill
:
$gl-text-color
;
}
}
&
:hover
{
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$dropdown-toggle-active-border-color
;
svg
{
fill
:
$gl-text-color-secondary
;
position
:
relative
;
top
:
-1px
;
fill
:
$gl-text-color
;
}
}
&
.play
{
svg
{
left
:
2px
;
}
svg
{
fill
:
$gl-text-color-secondary
;
position
:
relative
;
top
:
-1px
;
}
&
.play
{
svg
{
left
:
2px
;
}
}
}
}
.build
{
position
:
relative
;
width
:
186px
;
margin-bottom
:
10px
;
white-space
:
normal
;
// ensure .build-content has hover style when action-icon is hovered
.ci-job-dropdown-container
:hover
.build-content
{
@extend
.build-content
:hover
;
}
.ci-status-icon
svg
{
height
:
20px
;
...
...
@@ -604,6 +604,55 @@
}
}
/**
Icons inside dropdown
*/
.big-pipeline-graph-dropdown-menu
,
.mini-pipeline-graph-dropdown-menu
{
// override dropdown.scss
&
.dropdown-menu
li
button
{
padding
:
0
;
text-align
:
center
;
}
.ci-action-icon-container
{
position
:
absolute
;
right
:
5px
;
top
:
5px
;
// Action Icons in big pipeline-graph nodes
&
.ci-action-icon-wrapper
{
height
:
$ci-action-dropdown-button-size
;
width
:
$ci-action-dropdown-button-size
;
background
:
$white-light
;
border
:
1px
solid
$border-color
;
border-radius
:
50%
;
display
:
block
;
&
:hover
{
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$dropdown-toggle-active-border-color
;
svg
{
fill
:
$gl-text-color
;
}
}
svg
{
width
:
$ci-action-dropdown-svg-size
;
height
:
$ci-action-dropdown-svg-size
;
fill
:
$gl-text-color-secondary
;
position
:
relative
;
top
:
0px
;
vertical-align
:
initial
;
}
}
}
}
// Triggers the dropdown in the big pipeline graph
.dropdown-counter-badge
{
font-weight
:
100
;
...
...
app/views/shared/_mini_pipeline_graph.html.haml
View file @
2c835eec
...
...
@@ -12,6 +12,7 @@
%ul
.dropdown-menu.mini-pipeline-graph-dropdown-menu.js-builds-dropdown-container
%li
.js-builds-dropdown-list.scrollable-menu
%ul
%li
.js-builds-dropdown-loading.hidden
.text-center
...
...
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