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
2320a5c7
Commit
2320a5c7
authored
Dec 07, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adds new icons for pipeline graph
Fix padding Fix hover state of icon
parent
bd30f75a
Changes
11
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
56 additions
and
24 deletions
+56
-24
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+3
-2
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+44
-22
app/views/shared/icons/_icon_graph_job_cancelled.svg
app/views/shared/icons/_icon_graph_job_cancelled.svg
+1
-0
app/views/shared/icons/_icon_graph_job_created.svg
app/views/shared/icons/_icon_graph_job_created.svg
+1
-0
app/views/shared/icons/_icon_graph_job_failed.svg
app/views/shared/icons/_icon_graph_job_failed.svg
+1
-0
app/views/shared/icons/_icon_graph_job_manual.svg
app/views/shared/icons/_icon_graph_job_manual.svg
+1
-0
app/views/shared/icons/_icon_graph_job_pending.svg
app/views/shared/icons/_icon_graph_job_pending.svg
+1
-0
app/views/shared/icons/_icon_graph_job_running.svg
app/views/shared/icons/_icon_graph_job_running.svg
+1
-0
app/views/shared/icons/_icon_graph_job_skipped.svg
app/views/shared/icons/_icon_graph_job_skipped.svg
+1
-0
app/views/shared/icons/_icon_graph_job_success.svg
app/views/shared/icons/_icon_graph_job_success.svg
+1
-0
app/views/shared/icons/_icon_graph_job_warning.svg
app/views/shared/icons/_icon_graph_job_warning.svg
+1
-0
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
2320a5c7
...
@@ -647,7 +647,7 @@
...
@@ -647,7 +647,7 @@
color
:
$gl-text-color-light
;
color
:
$gl-text-color-light
;
a
{
a
{
padding
:
7px
8px
8
px
;
padding
:
6px
8px
7
px
;
}
}
a
.ci-action-icon-container
{
a
.ci-action-icon-container
{
...
@@ -692,11 +692,12 @@
...
@@ -692,11 +692,12 @@
vertical-align
:
middle
;
vertical-align
:
middle
;
padding
:
5px
;
padding
:
5px
;
font-size
:
13px
;
font-size
:
13px
;
background
:
$white-light
;
&
:hover
{
&
:hover
{
color
:
$gl-text-color
;
color
:
$gl-text-color
;
background-color
:
$stage-hover-bg
;
background-color
:
$stage-hover-bg
;
border
:
1px
solid
$
gl-text-color
;
border
:
1px
solid
$
stage-hover-bg
;
}
}
}
}
...
...
app/helpers/ci_status_helper.rb
View file @
2320a5c7
...
@@ -43,11 +43,32 @@ module CiStatusHelper
...
@@ -43,11 +43,32 @@ module CiStatusHelper
status
.
humanize
status
.
humanize
end
end
def
ci_icon_for_status
(
status
)
def
ci_icon_for_status
(
status
,
graph:
nil
)
if
detailed_status?
(
status
)
if
detailed_status?
(
status
)
return
custom_icon
(
status
.
icon
)
return
custom_icon
(
status
.
icon
)
end
end
if
graph
icon_name
=
case
status
when
'success'
'icon_graph_job_success'
when
'success_with_warnings'
'icon_graph_job_warning'
when
'failed'
'icon_graph_job_failed'
when
'pending'
'icon_graph_job_pending'
when
'running'
'icon_graph_job_running'
when
'created'
'icon_graph_job_created'
when
'skipped'
'icon_graph_job_skipped'
else
'icon_graph_job_canceled'
end
else
icon_name
=
icon_name
=
case
status
case
status
when
'success'
when
'success'
...
@@ -69,6 +90,7 @@ module CiStatusHelper
...
@@ -69,6 +90,7 @@ module CiStatusHelper
else
else
'icon_status_canceled'
'icon_status_canceled'
end
end
end
custom_icon
(
icon_name
)
custom_icon
(
icon_name
)
end
end
...
...
app/views/shared/icons/_icon_graph_job_cancelled.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M5.2 3.8l4.9 4.9c.2.2.2.5 0 .7l-.7.7c-.2.2-.5.2-.7 0L3.8 5.2c-.2-.2-.2-.5 0-.7l.7-.7c.2-.2.5-.2.7 0"
/></g></svg>
app/views/shared/icons/_icon_graph_job_created.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><circle
cx=
"7"
cy=
"7"
r=
"3.25"
/></g></svg>
app/views/shared/icons/_icon_graph_job_failed.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M7 5.969L5.599 4.568a.29.29 0 0 0-.413.004l-.614.614a.294.294 0 0 0-.004.413L5.968 7l-1.4 1.401a.29.29 0 0 0 .004.413l.614.614c.113.114.3.117.413.004L7 8.032l1.401 1.4a.29.29 0 0 0 .413-.004l.614-.614a.294.294 0 0 0 .004-.413L8.032 7l1.4-1.401a.29.29 0 0 0-.004-.413l-.614-.614a.294.294 0 0 0-.413-.004L7 5.968z"
/></g></svg>
app/views/shared/icons/_icon_graph_job_manual.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M10.5 7.63V6.37l-.787-.13c-.044-.175-.132-.349-.263-.61l.481-.652-.918-.913-.657.478a2.346 2.346 0 0 0-.612-.26L7.656 3.5H6.388l-.132.783c-.219.043-.394.13-.612.26l-.657-.478-.918.913.437.652c-.131.218-.175.392-.262.61l-.744.086v1.261l.787.13c.044.218.132.392.263.61l-.438.651.92.913.655-.434c.175.086.394.173.613.26l.131.783h1.313l.131-.783c.219-.043.394-.13.613-.26l.656.478.918-.913-.48-.652c.13-.218.218-.435.262-.61l.656-.13zM7 8.283a1.285 1.285 0 0 1-1.313-1.305c0-.739.57-1.304 1.313-1.304.744 0 1.313.565 1.313 1.304 0 .74-.57 1.305-1.313 1.305z"
/></g></svg>
app/views/shared/icons/_icon_graph_job_pending.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M4.7 5.3c0-.2.1-.3.3-.3h.9c.2 0 .3.1.3.3v3.4c0 .2-.1.3-.3.3H5c-.2 0-.3-.1-.3-.3V5.3m3 0c0-.2.1-.3.3-.3h.9c.2 0 .3.1.3.3v3.4c0 .2-.1.3-.3.3H8c-.2 0-.3-.1-.3-.3V5.3"
/></g></svg>
app/views/shared/icons/_icon_graph_job_running.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M7 3c2.2 0 4 1.8 4 4s-1.8 4-4 4c-1.3 0-2.5-.7-3.3-1.7L7 7V3"
/></g></svg>
app/views/shared/icons/_icon_graph_job_skipped.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M7.69 7.7l-.905.905a.7.7 0 0 0 .99.99l1.85-1.85c.411-.412.411-1.078 0-1.49l-1.85-1.85a.7.7 0 0 0-.99.99l.905.905H4.48a.7.7 0 0 0 0 1.4h3.21z"
/></g></svg>
app/views/shared/icons/_icon_graph_job_success.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M6.278 7.697L5.045 6.464a.296.296 0 0 0-.42-.002l-.613.614a.298.298 0 0 0 .002.42l1.91 1.909a.5.5 0 0 0 .703.005l.265-.265L9.997 6.04a.291.291 0 0 0-.009-.408l-.614-.614a.29.29 0 0 0-.408-.009L6.278 7.697z"
/></g></svg>
app/views/shared/icons/_icon_graph_job_warning.svg
0 → 100755
View file @
2320a5c7
<svg
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns=
"http://www.w3.org/2000/svg"
><g
fill-rule=
"evenodd"
><path
d=
"M0 7a7 7 0 1 1 14 0A7 7 0 0 1 0 7z"
/><path
d=
"M13 7A6 6 0 1 0 1 7a6 6 0 0 0 12 0z"
fill=
"#FFF"
/><path
d=
"M6 3.5c0-.3.2-.5.5-.5h1c.3 0 .5.2.5.5v4c0 .3-.2.5-.5.5h-1c-.3 0-.5-.2-.5-.5v-4m0 6c0-.3.2-.5.5-.5h1c.3 0 .5.2.5.5v1c0 .3-.2.5-.5.5h-1c-.3 0-.5-.2-.5-.5v-1"
/></g></svg>
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