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
e0b7541b
Commit
e0b7541b
authored
Apr 20, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleans up CSS - All pipeline dropdowns use the same CSS to render the action icons
parent
9ff50410
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
133 additions
and
319 deletions
+133
-319
app/assets/javascripts/pipelines/components/stage.vue
app/assets/javascripts/pipelines/components/stage.vue
+118
-240
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+14
-78
app/views/ci/status/_dropdown_graph_badge.html.haml
app/views/ci/status/_dropdown_graph_badge.html.haml
+1
-1
No files found.
app/assets/javascripts/pipelines/components/stage.vue
View file @
e0b7541b
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/pages/pipelines.scss
View file @
e0b7541b
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
}
}
.ci-table
{
.ci-table
{
.label
{
.label
{
margin-bottom
:
3px
;
margin-bottom
:
3px
;
}
}
...
@@ -123,7 +122,6 @@
...
@@ -123,7 +122,6 @@
}
}
.branch-commit
{
.branch-commit
{
.ref-name
{
.ref-name
{
font-weight
:
$gl-font-weight-bold
;
font-weight
:
$gl-font-weight-bold
;
max-width
:
100px
;
max-width
:
100px
;
...
@@ -505,7 +503,7 @@
...
@@ -505,7 +503,7 @@
}
}
}
}
}
}
}
}
.build
{
.build
{
position
:
relative
;
position
:
relative
;
...
@@ -548,7 +546,6 @@
...
@@ -548,7 +546,6 @@
border
:
1px
solid
$dropdown-toggle-active-border-color
;
border
:
1px
solid
$dropdown-toggle-active-border-color
;
}
}
// Connect first build in each stage with right horizontal line
// Connect first build in each stage with right horizontal line
&
:first-child
{
&
:first-child
{
&
:
:
after
{
&
:
:
after
{
...
@@ -604,15 +601,18 @@
...
@@ -604,15 +601,18 @@
}
}
}
}
/**
/**
Icons inside dropdown
Action icons inside dropdowns:
- mini graph in pipelines table
- dropdown in big graph
- mini graph in MR widget pipeline
- mini graph in Commit widget pipeline
*/
*/
.big-pipeline-graph-dropdown-menu
,
.big-pipeline-graph-dropdown-menu
,
.mini-pipeline-graph-dropdown-menu
{
.mini-pipeline-graph-dropdown-menu
{
// override dropdown.scss
// override dropdown.scss
&
.dropdown-menu
li
button
{
&
.dropdown-menu
li
button
,
&
.dropdown-menu
li
a
.ci-action-icon-container
{
padding
:
0
;
padding
:
0
;
text-align
:
center
;
text-align
:
center
;
}
}
...
@@ -622,7 +622,6 @@
...
@@ -622,7 +622,6 @@
right
:
5px
;
right
:
5px
;
top
:
5px
;
top
:
5px
;
// Action Icons in big pipeline-graph nodes
&
.ci-action-icon-wrapper
{
&
.ci-action-icon-wrapper
{
height
:
$ci-action-dropdown-button-size
;
height
:
$ci-action-dropdown-button-size
;
width
:
$ci-action-dropdown-button-size
;
width
:
$ci-action-dropdown-button-size
;
...
@@ -651,6 +650,11 @@
...
@@ -651,6 +650,11 @@
}
}
}
}
}
}
// SVGs in the commit widget and mr widget
a
.ci-action-icon-container.ci-action-icon-wrapper
svg
{
top
:
2px
;
}
}
}
// Triggers the dropdown in the big pipeline graph
// Triggers the dropdown in the big pipeline graph
...
@@ -780,74 +784,6 @@ button.mini-pipeline-graph-dropdown-toggle {
...
@@ -780,74 +784,6 @@ button.mini-pipeline-graph-dropdown-toggle {
@extend
.mini-pipeline-graph-dropdown-item
:hover
;
@extend
.mini-pipeline-graph-dropdown-item
:hover
;
}
}
// Action icon on the right
a
.ci-action-icon-wrapper
{
border-radius
:
50%
;
border
:
1px
solid
$border-color
;
width
:
$ci-action-icon-size
;
height
:
$ci-action-icon-size
;
padding
:
2px
0
0
5px
;
font-size
:
12px
;
background-color
:
$white-light
;
position
:
absolute
;
top
:
50%
;
right
:
$gl-padding
;
margin-top
:
-
#{
$ci-action-icon-size
/
2
}
;
&
:hover
,
&
:focus
{
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$dropdown-toggle-active-border-color
;
}
svg
{
fill
:
$gl-text-color-secondary
;
width
:
#{
$ci-action-icon-size
-
6
}
;
height
:
#{
$ci-action-icon-size
-
6
}
;
left
:
-3px
;
position
:
relative
;
top
:
-1px
;
&
.icon-action-stop
,
&
.icon-action-cancel
{
width
:
12px
;
height
:
12px
;
top
:
1px
;
left
:
-1px
;
}
&
.icon-action-play
{
width
:
11px
;
height
:
11px
;
top
:
1px
;
left
:
1px
;
}
&
.icon-action-retry
{
width
:
16px
;
height
:
16px
;
top
:
0
;
left
:
-3px
;
}
}
&
:hover
svg
,
&
:focus
svg
{
fill
:
$gl-text-color
;
}
&
.icon-action-retry
,
&
.icon-action-play
{
svg
{
width
:
#{
$ci-action-icon-size
-
6
}
;
height
:
#{
$ci-action-icon-size
-
6
}
;
left
:
8px
;
}
}
}
// link to the build
// link to the build
.mini-pipeline-graph-dropdown-item
{
.mini-pipeline-graph-dropdown-item
{
align-items
:
center
;
align-items
:
center
;
...
@@ -988,7 +924,7 @@ button.mini-pipeline-graph-dropdown-toggle {
...
@@ -988,7 +924,7 @@ button.mini-pipeline-graph-dropdown-toggle {
&
.dropdown-menu
{
&
.dropdown-menu
{
transform
:
translate
(
-80%
,
0
);
transform
:
translate
(
-80%
,
0
);
@media
(
min-width
:
$screen-md-min
)
{
@media
(
min-width
:
$screen-md-min
)
{
transform
:
translate
(
-50%
,
0
);
transform
:
translate
(
-50%
,
0
);
right
:
auto
;
right
:
auto
;
left
:
50%
;
left
:
50%
;
...
...
app/views/ci/status/_dropdown_graph_badge.html.haml
View file @
e0b7541b
...
@@ -16,5 +16,5 @@
...
@@ -16,5 +16,5 @@
%span
.ci-build-text
=
subject
.
name
%span
.ci-build-text
=
subject
.
name
-
if
status
.
has_action?
-
if
status
.
has_action?
=
link_to
status
.
action_path
,
class:
"ci-action-icon-wrapper js-ci-action-icon"
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
,
container:
'body'
}
do
=
link_to
status
.
action_path
,
class:
"ci-action-icon-
container ci-action-icon-
wrapper js-ci-action-icon"
,
method:
status
.
action_method
,
data:
{
toggle:
'tooltip'
,
title:
status
.
action_title
,
container:
'body'
}
do
=
sprite_icon
(
status
.
action_icon
,
css_class:
"icon-action-
#{
status
.
action_icon
}
"
)
=
sprite_icon
(
status
.
action_icon
,
css_class:
"icon-action-
#{
status
.
action_icon
}
"
)
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