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
01876ecc
Commit
01876ecc
authored
Dec 14, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Initial commit
parent
1235d96e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
3 deletions
+54
-3
app/assets/stylesheets/framework/icons.scss
app/assets/stylesheets/framework/icons.scss
+24
-0
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+26
-0
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+4
-3
No files found.
app/assets/stylesheets/framework/icons.scss
View file @
01876ecc
...
@@ -4,6 +4,10 @@
...
@@ -4,6 +4,10 @@
svg
{
svg
{
fill
:
$gl-success
;
fill
:
$gl-success
;
}
}
.builds-dropdown-caret
{
color
:
$gl-success
;
}
}
}
.ci-status-icon-failed
{
.ci-status-icon-failed
{
...
@@ -12,6 +16,10 @@
...
@@ -12,6 +16,10 @@
svg
{
svg
{
fill
:
$gl-danger
;
fill
:
$gl-danger
;
}
}
.builds-dropdown-caret
{
color
:
$gl-danger
;
}
}
}
.ci-status-icon-pending
,
.ci-status-icon-pending
,
...
@@ -21,6 +29,10 @@
...
@@ -21,6 +29,10 @@
svg
{
svg
{
fill
:
$gl-warning
;
fill
:
$gl-warning
;
}
}
.builds-dropdown-caret
{
color
:
$gl-warning
;
}
}
}
.ci-status-icon-running
{
.ci-status-icon-running
{
...
@@ -29,6 +41,10 @@
...
@@ -29,6 +41,10 @@
svg
{
svg
{
fill
:
$blue-normal
;
fill
:
$blue-normal
;
}
}
.builds-dropdown-caret
{
color
:
$blue-normal
;
}
}
}
.ci-status-icon-canceled
,
.ci-status-icon-canceled
,
...
@@ -39,6 +55,10 @@
...
@@ -39,6 +55,10 @@
svg
{
svg
{
fill
:
$gl-gray
;
fill
:
$gl-gray
;
}
}
.builds-dropdown-caret
{
color
:
$gl-gray
;
}
}
}
.ci-status-icon-created
,
.ci-status-icon-created
,
...
@@ -48,4 +68,8 @@
...
@@ -48,4 +68,8 @@
svg
{
svg
{
fill
:
$gray-darkest
;
fill
:
$gray-darkest
;
}
}
.builds-dropdown-caret
{
color
:
$gray-darkest
;
}
}
}
app/assets/stylesheets/pages/pipelines.scss
View file @
01876ecc
...
@@ -734,3 +734,29 @@
...
@@ -734,3 +734,29 @@
padding
:
5px
5px
5px
7px
;
padding
:
5px
5px
5px
7px
;
}
}
}
}
/**
* Builds dropdown in mini pipeline
*/
.builds-dropdown
{
border
:
none
;
background
:
transparent
;
padding
:
0
;
font-size
:
inherit
;
border-radius
:
0
;
cursor
:
pointer
;
.dropdown-caret
{
display
:
none
;
position
:
absolute
;
top
:
3px
;
right
:
6px
;
font-size
:
10px
;
}
&
:hover
{
.dropdown-caret
{
display
:
block
;
}
}
}
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
01876ecc
...
@@ -51,15 +51,16 @@
...
@@ -51,15 +51,16 @@
.stage-container
.stage-container
-
if
hasMultipleBuilds
-
if
hasMultipleBuilds
.dropdown.inline
.dropdown.inline
%a
.dropdown-toggle
{
id:
"dropdown-#{stage.name}"
,
"data-toggle"
=>
"dropdown"
,
"aria-haspopup"
=>
"true"
,
"aria-expanded"
=>
"false"
}
%a
.dropdown-toggle
.builds-dropdown
{
id:
"dropdown-#{stage.name}"
,
title:
tooltip
,
class:
"has-tooltip ci-status-icon-#{stage.status}"
,
"data-toggle"
=>
"dropdown"
,
"aria-haspopup"
=>
"true"
,
"aria-expanded"
=>
"false"
}
=
ci_icon_for_status
(
stage
.
detailed_status
)
=
ci_icon_for_status
(
stage
.
detailed_status
)
%span
.caret
=
icon
(
'caret-down'
,
class:
'dropdown-caret'
)
.dropdown-menu.grouped-pipeline-dropdown
{
"aria-labelledby"
=>
"dropdown-#{stage.name}"
}
.dropdown-menu.grouped-pipeline-dropdown
{
"aria-labelledby"
=>
"dropdown-#{stage.name}"
}
.arrow
.arrow
%ul
%ul
-
stage
.
statuses
.
each
do
|
status
|
-
stage
.
statuses
.
each
do
|
status
|
%li
%li
status
=
ci_icon_for_status
(
status
)
-# =render 'ci/status/icon_with_name_and_action', subject: status
-
else
-
else
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
,
anchor:
stage
.
name
),
class:
"has-tooltip ci-status-icon-
#{
stage
.
status
}
"
,
title:
tooltip
do
=
link_to
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
,
anchor:
stage
.
name
),
class:
"has-tooltip ci-status-icon-
#{
stage
.
status
}
"
,
title:
tooltip
do
=
ci_icon_for_status
(
stage
.
detailed_status
)
=
ci_icon_for_status
(
stage
.
detailed_status
)
...
...
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