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
Léo-Paul Géneau
gitlab-ce
Commits
da55496b
Commit
da55496b
authored
Jul 15, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new running icon; add a bunch of styles to get svg to match existing fa icons
parent
ad14c1bf
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
106 additions
and
3 deletions
+106
-3
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+9
-0
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+7
-0
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+8
-0
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+2
-2
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
app/views/shared/icons/_icon_running.svg
app/views/shared/icons/_icon_running.svg
+12
-0
app/views/shared/icons/_icon_status_cancel.svg
app/views/shared/icons/_icon_status_cancel.svg
+12
-0
app/views/shared/icons/_icon_status_failed.svg
app/views/shared/icons/_icon_status_failed.svg
+12
-0
app/views/shared/icons/_icon_status_passed.svg
app/views/shared/icons/_icon_status_passed.svg
+15
-0
app/views/shared/icons/_icon_status_pending.svg
app/views/shared/icons/_icon_status_pending.svg
+13
-0
app/views/shared/icons/_icon_status_warning.svg
app/views/shared/icons/_icon_status_warning.svg
+15
-0
No files found.
app/assets/stylesheets/pages/pipelines.scss
View file @
da55496b
...
@@ -123,6 +123,15 @@
...
@@ -123,6 +123,15 @@
right
:
1px
;
right
:
1px
;
}
}
}
}
.stage-cell
{
svg
{
height
:
13px
;
width
:
13px
;
margin-left
:
3px
;
}
}
.duration
,
.duration
,
.finished-at
{
.finished-at
{
...
...
app/assets/stylesheets/pages/projects.scss
View file @
da55496b
...
@@ -536,6 +536,13 @@ pre.light-well {
...
@@ -536,6 +536,13 @@ pre.light-well {
.ci-status
{
.ci-status
{
margin-right
:
$gl-padding
;
margin-right
:
$gl-padding
;
&
.ci-running
{
svg
{
margin-right
:
3px
;
}
}
}
}
.commit-row-message
{
.commit-row-message
{
...
...
app/assets/stylesheets/pages/status.scss
View file @
da55496b
...
@@ -41,6 +41,14 @@
...
@@ -41,6 +41,14 @@
color
:
$blue-normal
;
color
:
$blue-normal
;
border-color
:
$blue-normal
;
border-color
:
$blue-normal
;
}
}
svg
{
width
:
13px
;
height
:
13px
;
position
:
relative
;
top
:
1px
;
margin-left
:
3px
;
}
}
}
.ci-status-icon-success
{
.ci-status-icon-success
{
...
...
app/helpers/ci_status_helper.rb
View file @
da55496b
...
@@ -32,12 +32,12 @@ module CiStatusHelper
...
@@ -32,12 +32,12 @@ module CiStatusHelper
when
'pending'
when
'pending'
'clock-o'
'clock-o'
when
'running'
when
'running'
'
spinner
'
'
icon_running
'
else
else
'circle'
'circle'
end
end
icon
(
icon_name
+
' fw'
)
status
==
'running'
?
custom_icon
(
icon_name
)
:
icon
(
icon_name
+
' fw'
)
end
end
def
render_commit_status
(
commit
,
tooltip_placement:
'auto left'
,
cssclass:
''
)
def
render_commit_status
(
commit
,
tooltip_placement:
'auto left'
,
cssclass:
''
)
...
...
app/views/projects/ci/pipelines/_pipeline.html.haml
View file @
da55496b
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
-
stages_status
=
pipeline
.
statuses
.
latest
.
stages_status
-
stages_status
=
pipeline
.
statuses
.
latest
.
stages_status
-
stages
.
each
do
|
stage
|
-
stages
.
each
do
|
stage
|
%td
%td
.stage-cell
-
status
=
stages_status
[
stage
]
-
status
=
stages_status
[
stage
]
-
tooltip
=
"
#{
stage
.
titleize
}
:
#{
status
||
'not found'
}
"
-
tooltip
=
"
#{
stage
.
titleize
}
:
#{
status
||
'not found'
}
"
-
if
status
-
if
status
...
...
app/views/shared/icons/_icon_running.svg
0 → 100644
View file @
da55496b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<defs>
<circle
id=
"a"
cx=
"7"
cy=
"7"
r=
"7"
/>
<mask
id=
"b"
width=
"14"
height=
"14"
x=
"0"
y=
"0"
fill=
"white"
>
<use
xlink:href=
"#a"
/>
</mask>
</defs>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<use
stroke=
"#2D9FD8"
stroke-width=
"4"
mask=
"url(#b)"
xlink:href=
"#a"
/>
<path
fill=
"#2D9FD8"
d=
"M7,3.00800862 C9.09023405,3.13960661 10.7448145,4.87657932 10.7448145,7 C10.7448145,9.209139 8.95395346,11 6.74481446,11 C5.4560962,11 4.30972054,10.3905589 3.57817301,9.44416214 L7,7 L7,3.00800862 Z"
/>
</g>
</svg>
app/views/shared/icons/_icon_status_cancel.svg
0 → 100644
View file @
da55496b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<defs>
<circle
id=
"a"
cx=
"7"
cy=
"7"
r=
"7"
/>
<mask
id=
"b"
width=
"14"
height=
"14"
x=
"0"
y=
"0"
fill=
"white"
>
<use
xlink:href=
"#a"
/>
</mask>
</defs>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<use
stroke=
"#5C5C5C"
stroke-width=
"2"
mask=
"url(#b)"
xlink:href=
"#a"
/>
<rect
width=
"10"
height=
"1"
x=
"2"
y=
"6.5"
fill=
"#5C5C5C"
transform=
"rotate(45 7 7)"
rx=
".3"
/>
</g>
</svg>
app/views/shared/icons/_icon_status_failed.svg
0 → 100644
View file @
da55496b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<defs>
<circle
id=
"a"
cx=
"7"
cy=
"7"
r=
"7"
/>
<mask
id=
"b"
width=
"14"
height=
"14"
x=
"0"
y=
"0"
fill=
"white"
>
<use
xlink:href=
"#a"
/>
</mask>
</defs>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<use
stroke=
"#D22852"
stroke-width=
"2"
mask=
"url(#b)"
xlink:href=
"#a"
/>
<path
fill=
"#D22852"
d=
"M7.5,6.5 L7.5,4.30578971 C7.5,4.12531853 7.36809219,4 7.20537567,4 L6.79462433,4 C6.63904572,4 6.5,4.13690672 6.5,4.30578971 L6.5,6.5 L4.30578971,6.5 C4.12531853,6.5 4,6.63190781 4,6.79462433 L4,7.20537567 C4,7.36095428 4.13690672,7.5 4.30578971,7.5 L6.5,7.5 L6.5,9.69421029 C6.5,9.87468147 6.63190781,10 6.79462433,10 L7.20537567,10 C7.36095428,10 7.5,9.86309328 7.5,9.69421029 L7.5,7.5 L9.69421029,7.5 C9.87468147,7.5 10,7.36809219 10,7.20537567 L10,6.79462433 C10,6.63904572 9.86309328,6.5 9.69421029,6.5 L7.5,6.5 Z"
transform=
"rotate(45 7 7)"
/>
</g>
</svg>
app/views/shared/icons/_icon_status_passed.svg
0 → 100644
View file @
da55496b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<defs>
<circle
id=
"a"
cx=
"7"
cy=
"7"
r=
"7"
/>
<mask
id=
"b"
width=
"14"
height=
"14"
x=
"0"
y=
"0"
fill=
"white"
>
<use
xlink:href=
"#a"
/>
</mask>
</defs>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<use
stroke=
"#31AF64"
stroke-width=
"2"
mask=
"url(#b)"
xlink:href=
"#a"
/>
<g
fill=
"#31AF64"
transform=
"rotate(45 -.13 10.953)"
>
<rect
width=
"1"
height=
"5"
x=
"2"
rx=
".3"
/>
<rect
width=
"3"
height=
"1"
y=
"4"
rx=
".3"
/>
</g>
</g>
</svg>
app/views/shared/icons/_icon_status_pending.svg
0 → 100644
View file @
da55496b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<defs>
<circle
id=
"a"
cx=
"7"
cy=
"7"
r=
"7"
/>
<mask
id=
"b"
width=
"14"
height=
"14"
x=
"0"
y=
"0"
fill=
"white"
>
<use
xlink:href=
"#a"
/>
</mask>
</defs>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<use
stroke=
"#E75E40"
stroke-width=
"2"
mask=
"url(#b)"
xlink:href=
"#a"
/>
<rect
width=
"1"
height=
"4"
x=
"5"
y=
"5"
fill=
"#E75E40"
rx=
".3"
/>
<rect
width=
"1"
height=
"4"
x=
"8"
y=
"5"
fill=
"#E75E40"
rx=
".3"
/>
</g>
</svg>
app/views/shared/icons/_icon_status_warning.svg
0 → 100644
View file @
da55496b
<svg
xmlns=
"http://www.w3.org/2000/svg"
width=
"14"
height=
"14"
viewBox=
"0 0 14 14"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
>
<defs>
<circle
id=
"a"
cx=
"7"
cy=
"7"
r=
"7"
/>
<mask
id=
"b"
width=
"14"
height=
"14"
x=
"0"
y=
"0"
fill=
"white"
>
<use
xlink:href=
"#a"
/>
</mask>
</defs>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<g
fill=
"#FF8A24"
transform=
"translate(6 3)"
>
<rect
width=
"2"
height=
"5"
rx=
".5"
/>
<rect
width=
"2"
height=
"2"
y=
"6"
rx=
".5"
/>
</g>
<use
stroke=
"#FF8A24"
stroke-width=
"2"
mask=
"url(#b)"
xlink:href=
"#a"
/>
</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