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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
0301fa8d
Commit
0301fa8d
authored
Jul 19, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new icons for every CI status
parent
5b5cafe0
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
42 additions
and
28 deletions
+42
-28
app/assets/stylesheets/pages/issues.scss
app/assets/stylesheets/pages/issues.scss
+8
-0
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+13
-1
app/assets/stylesheets/pages/pipelines.scss
app/assets/stylesheets/pages/pipelines.scss
+3
-4
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+8
-15
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+8
-6
app/views/projects/ci/pipelines/_pipeline.html.haml
app/views/projects/ci/pipelines/_pipeline.html.haml
+1
-1
app/views/shared/icons/_icon_status_running.svg
app/views/shared/icons/_icon_status_running.svg
+1
-1
app/views/shared/icons/_icon_status_success.svg
app/views/shared/icons/_icon_status_success.svg
+0
-0
No files found.
app/assets/stylesheets/pages/issues.scss
View file @
0301fa8d
...
@@ -78,6 +78,14 @@ form.edit-issue {
...
@@ -78,6 +78,14 @@ form.edit-issue {
}
}
}
}
.merge-request-ci-status
{
svg
{
margin-right
:
4px
;
position
:
relative
;
top
:
1px
;
}
}
@media
(
max-width
:
$screen-xs-max
)
{
@media
(
max-width
:
$screen-xs-max
)
{
.issue-btn-group
{
.issue-btn-group
{
width
:
100%
;
width
:
100%
;
...
...
app/assets/stylesheets/pages/merge_requests.scss
View file @
0301fa8d
...
@@ -60,8 +60,10 @@
...
@@ -60,8 +60,10 @@
.ci_widget
{
.ci_widget
{
border-bottom
:
1px
solid
#eef0f2
;
border-bottom
:
1px
solid
#eef0f2
;
i
{
svg
{
margin-right
:
4px
;
margin-right
:
4px
;
position
:
relative
;
top
:
1px
;
}
}
&
.ci-success
{
&
.ci-success
{
...
@@ -196,6 +198,16 @@
...
@@ -196,6 +198,16 @@
.merge-request-title
{
.merge-request-title
{
margin-bottom
:
2px
;
margin-bottom
:
2px
;
.ci-status-link
{
svg
{
height
:
16px
;
width
:
16px
;
position
:
relative
;
top
:
3px
;
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/pipelines.scss
View file @
0301fa8d
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
.commit-link
{
.commit-link
{
.ci-
running
{
.ci-
status
{
svg
{
svg
{
top
:
1px
;
top
:
1px
;
...
@@ -135,9 +135,8 @@
...
@@ -135,9 +135,8 @@
.stage-cell
{
.stage-cell
{
svg
{
svg
{
height
:
13px
;
height
:
18px
;
width
:
13px
;
width
:
18px
;
margin-left
:
3px
;
}
}
}
}
...
...
app/assets/stylesheets/pages/status.scss
View file @
0301fa8d
...
@@ -41,6 +41,14 @@
...
@@ -41,6 +41,14 @@
color
:
$blue-normal
;
color
:
$blue-normal
;
border-color
:
$blue-normal
;
border-color
:
$blue-normal
;
}
}
svg
{
height
:
13px
;
width
:
13px
;
position
:
relative
;
top
:
1px
;
margin
:
0
3px
;
}
}
}
.ci-status-icon-success
{
.ci-status-icon-success
{
...
@@ -62,18 +70,3 @@
...
@@ -62,18 +70,3 @@
color
:
$gl-gray
;
color
:
$gl-gray
;
}
}
}
}
.ci-running
,
.ci-status-icon-running
{
svg
{
height
:
13px
;
width
:
13px
;
position
:
relative
;
top
:
2px
;
margin
:
0
3px
;
}
&
:hover
{
text-decoration
:
none
;
}
}
app/helpers/ci_status_helper.rb
View file @
0301fa8d
...
@@ -26,18 +26,20 @@ module CiStatusHelper
...
@@ -26,18 +26,20 @@ module CiStatusHelper
icon_name
=
icon_name
=
case
status
case
status
when
'success'
when
'success'
'check'
'icon_status_success'
when
'success_with_warnings'
'icon_status_warning'
when
'failed'
when
'failed'
'
close
'
'
icon_status_failed
'
when
'pending'
when
'pending'
'
clock-o
'
'
icon_status_pending
'
when
'running'
when
'running'
'icon_running'
'icon_
status_
running'
else
else
'
circle
'
'
icon_status_cancel
'
end
end
status
==
'running'
?
custom_icon
(
icon_name
)
:
icon
(
icon_name
+
' fw'
)
custom_icon
(
icon_name
)
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 @
0301fa8d
...
@@ -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
→
app/views/shared/icons/_icon_
status_
running.svg
View file @
0301fa8d
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
</mask>
</mask>
</defs>
</defs>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<g
fill=
"none"
fill-rule=
"evenodd"
>
<use
stroke=
"#2D9FD8"
stroke-width=
"
4
"
mask=
"url(#b)"
xlink:href=
"#a"
/>
<use
stroke=
"#2D9FD8"
stroke-width=
"
2
"
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"
/>
<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>
</g>
</svg>
</svg>
app/views/shared/icons/_icon_status_
passed
.svg
→
app/views/shared/icons/_icon_status_
success
.svg
View file @
0301fa8d
File moved
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