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
3404e10f
Commit
3404e10f
authored
Jul 12, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change running status color to blue; update icon to spinner
parent
1005262c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
6 deletions
+17
-6
app/assets/stylesheets/pages/merge_requests.scss
app/assets/stylesheets/pages/merge_requests.scss
+5
-2
app/assets/stylesheets/pages/status.scss
app/assets/stylesheets/pages/status.scss
+9
-3
app/helpers/ci_status_helper.rb
app/helpers/ci_status_helper.rb
+3
-1
No files found.
app/assets/stylesheets/pages/merge_requests.scss
View file @
3404e10f
...
...
@@ -73,11 +73,14 @@
color
:
#888
;
}
&
.ci-pending
,
&
.ci-running
{
&
.ci-pending
{
color
:
$gl-warning
;
}
&
.ci-running
{
color
:
$blue-normal
;
}
&
.ci-failed
,
&
.ci-error
{
color
:
$gl-danger
;
...
...
app/assets/stylesheets/pages/status.scss
View file @
3404e10f
...
...
@@ -32,11 +32,15 @@
border-color
:
$gl-gray
;
}
&
.ci-pending
,
&
.ci-running
{
&
.ci-pending
{
color
:
$gl-warning
;
border-color
:
$gl-warning
;
}
&
.ci-running
{
color
:
$blue-normal
;
border-color
:
$blue-normal
;
}
}
.ci-status-icon-success
{
...
...
@@ -45,10 +49,12 @@
.ci-status-icon-failed
{
color
:
$gl-danger
;
}
.ci-status-icon-running
,
.ci-status-icon-pending
{
color
:
$gl-warning
;
}
.ci-status-icon-running
{
color
:
$blue-normal
;
}
.ci-status-icon-canceled
,
.ci-status-icon-disabled
,
.ci-status-icon-not-found
,
...
...
app/helpers/ci_status_helper.rb
View file @
3404e10f
...
...
@@ -29,8 +29,10 @@ module CiStatusHelper
'check'
when
'failed'
'close'
when
'
running'
,
'
pending'
when
'pending'
'clock-o'
when
'running'
'spinner'
else
'circle'
end
...
...
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