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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
de5f2ef4
Commit
de5f2ef4
authored
Sep 28, 2017
by
Tim Zallmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated Static Icons from CI Area
parent
2573818f
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
25 additions
and
22 deletions
+25
-22
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+1
-1
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+9
-7
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+12
-12
app/views/projects/jobs/_sidebar.html.haml
app/views/projects/jobs/_sidebar.html.haml
+3
-2
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
de5f2ef4
...
...
@@ -99,7 +99,7 @@
color
:
$gray-darkest
;
}
.fa-chevron-down
{
.fa-chevron-down
,
{
font-size
:
$dropdown-chevron-size
;
position
:
relative
;
top
:
-2px
;
...
...
app/assets/stylesheets/pages/builds.scss
View file @
de5f2ef4
...
...
@@ -333,8 +333,10 @@
svg
{
position
:
relative
;
top
:
2
px
;
top
:
3
px
;
margin-right
:
3px
;
width
:
14px
;
height
:
14px
;
}
}
...
...
@@ -348,9 +350,10 @@
svg
{
position
:
relative
;
top
:
2
px
;
top
:
3
px
;
margin-right
:
3px
;
height
:
13px
;
height
:
14px
;
width
:
14px
;
}
a
{
...
...
@@ -369,7 +372,7 @@
.build-job
{
position
:
relative
;
.
fa
-arrow-right
{
.
icon
-arrow-right
{
position
:
absolute
;
left
:
15px
;
top
:
20px
;
...
...
@@ -379,7 +382,7 @@
&
.active
{
font-weight
:
$gl-font-weight-bold
;
.
fa
-arrow-right
{
.
icon
-arrow-right
{
display
:
block
;
}
}
...
...
@@ -392,8 +395,7 @@
background-color
:
$row-hover
;
}
.fa-refresh
{
font-size
:
13px
;
.icon-retry
{
margin-left
:
3px
;
}
}
...
...
app/helpers/ci_status_helper.rb
View file @
de5f2ef4
...
...
@@ -63,34 +63,34 @@ module CiStatusHelper
def
ci_icon_for_status
(
status
)
if
detailed_status?
(
status
)
return
custom
_icon
(
status
.
icon
)
return
sprite
_icon
(
status
.
icon
)
end
icon_name
=
case
status
when
'success'
'
icon_
status_success'
'status_success'
when
'success_with_warnings'
'
icon_
status_warning'
'status_warning'
when
'failed'
'
icon_
status_failed'
'status_failed'
when
'pending'
'
icon_
status_pending'
'status_pending'
when
'running'
'
icon_
status_running'
'status_running'
when
'play'
'
icon_
play'
'play'
when
'created'
'
icon_
status_created'
'status_created'
when
'skipped'
'
icon_
status_skipped'
'status_skipped'
when
'manual'
'
icon_
status_manual'
'status_manual'
else
'
icon_
status_canceled'
'status_canceled'
end
custom
_icon
(
icon_name
)
sprite
_icon
(
icon_name
)
end
def
pipeline_status_cache_key
(
pipeline_status
)
...
...
app/views/projects/jobs/_sidebar.html.haml
View file @
de5f2ef4
...
...
@@ -91,7 +91,7 @@
-
builds
.
select
{
|
build
|
build
.
status
==
build_status
}.
each
do
|
build
|
.build-job
{
class:
sidebar_build_class
(
build
,
@build
),
data:
{
stage:
build
.
stage
}
}
=
link_to
project_job_path
(
@project
,
build
)
do
=
icon
(
'
arrow-right'
)
=
sprite_icon
(
'arrow-right'
,
size
:
16
,
css_class:
'icon-
arrow-right'
)
%span
{
class:
"ci-status-icon-#{build.status}"
}
=
ci_icon_for_status
(
build
.
status
)
%span
...
...
@@ -100,4 +100,5 @@
-
else
=
build
.
id
-
if
build
.
retried?
%i
.fa.fa-refresh.has-tooltip
{
data:
{
container:
'body'
,
placement:
'bottom'
},
title:
'Job was retried'
}
%span
.has-tooltip
{
data:
{
container:
'body'
,
placement:
'bottom'
},
title:
'Job was retried'
}
=
sprite_icon
(
'retry'
,
size
:
16
,
css_class:
'icon-retry'
)
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