summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/assets/stylesheets/ci/projects.scss27
-rw-r--r--app/helpers/ci/builds_helper.rb10
-rw-r--r--app/helpers/ci/commits_helper.rb12
-rw-r--r--app/views/ci/admin/builds/_build.html.haml2
-rw-r--r--app/views/ci/admin/projects/_project.html.haml2
-rw-r--r--app/views/ci/admin/runners/show.html.haml2
-rw-r--r--app/views/ci/builds/_build.html.haml2
-rw-r--r--app/views/ci/builds/show.html.haml4
-rw-r--r--app/views/ci/commits/_commit.html.haml2
-rw-r--r--app/views/ci/commits/show.html.haml2
-rw-r--r--app/views/ci/projects/_project.html.haml2
11 files changed, 21 insertions, 46 deletions
diff --git a/app/assets/stylesheets/ci/projects.scss b/app/assets/stylesheets/ci/projects.scss
index e5d69360c2c..3b8a29269ad 100644
--- a/app/assets/stylesheets/ci/projects.scss
+++ b/app/assets/stylesheets/ci/projects.scss
@@ -13,31 +13,6 @@
.builds,
.projects-table {
- .alert-success {
- background-color: #6fc995;
- border-color: #5bba83;
- }
-
- .alert-danger {
- background-color: #eb897f;
- border-color: #d4776e;
- }
-
- .alert-info {
- background-color: #3498db;
- border-color: #2e8ece;
- }
-
- .alert-warning {
- background-color: #EB974E;
- border-color: #E87E04;
- }
-
- .alert-disabled {
- background: $background-color;
- border-color: $border-color;
- }
-
.light {
border-color: $border-color;
}
@@ -47,8 +22,8 @@
}
td {
+ color: $gl-gray;
vertical-align: middle !important;
- border-color: inherit !important;
a {
font-weight: normal;
diff --git a/app/helpers/ci/builds_helper.rb b/app/helpers/ci/builds_helper.rb
index cdabdad17d2..422994f5984 100644
--- a/app/helpers/ci/builds_helper.rb
+++ b/app/helpers/ci/builds_helper.rb
@@ -16,15 +16,15 @@ module Ci
ci_project_build_url(build.project, build)
end
- def build_status_alert_class(build)
+ def build_status_css_class(build)
if build.success?
- 'alert-success'
+ 'build-success'
elsif build.failed?
- 'alert-danger'
+ 'build-danger'
elsif build.canceled?
- 'alert-disabled'
+ 'build-disabled'
else
- 'alert-warning'
+ 'build-warning'
end
end
diff --git a/app/helpers/ci/commits_helper.rb b/app/helpers/ci/commits_helper.rb
index 74de30e006e..2c86bbffa36 100644
--- a/app/helpers/ci/commits_helper.rb
+++ b/app/helpers/ci/commits_helper.rb
@@ -1,17 +1,17 @@
module Ci
module CommitsHelper
- def commit_status_alert_class(commit)
- return 'alert-info' unless commit
+ def commit_status_css_class(commit)
+ return 'build-info' unless commit
case commit.status
when 'success'
- 'alert-success'
+ 'build-success'
when 'failed', 'canceled'
- 'alert-danger'
+ 'build-danger'
when 'skipped'
- 'alert-disabled'
+ 'build-disabled'
else
- 'alert-warning'
+ 'build-warning'
end
end
diff --git a/app/views/ci/admin/builds/_build.html.haml b/app/views/ci/admin/builds/_build.html.haml
index 47f8df8f98e..923219a2e46 100644
--- a/app/views/ci/admin/builds/_build.html.haml
+++ b/app/views/ci/admin/builds/_build.html.haml
@@ -1,5 +1,5 @@
- if build.commit && build.project
- %tr.build.alert{class: build_status_alert_class(build)}
+ %tr.build{class: build_status_css_class(build)}
%td.build-link
= link_to ci_project_build_url(build.project, build) do
%strong #{build.id}
diff --git a/app/views/ci/admin/projects/_project.html.haml b/app/views/ci/admin/projects/_project.html.haml
index 505dd4b3fdc..8017fb2086b 100644
--- a/app/views/ci/admin/projects/_project.html.haml
+++ b/app/views/ci/admin/projects/_project.html.haml
@@ -1,5 +1,5 @@
- last_commit = project.last_commit
-%tr.alert{class: commit_status_alert_class(last_commit) }
+%tr{class: commit_status_css_class(last_commit) }
%td
= project.id
%td
diff --git a/app/views/ci/admin/runners/show.html.haml b/app/views/ci/admin/runners/show.html.haml
index 24e0ad3b070..409db6ba82c 100644
--- a/app/views/ci/admin/runners/show.html.haml
+++ b/app/views/ci/admin/runners/show.html.haml
@@ -102,7 +102,7 @@
%th Finished at
- @builds.each do |build|
- %tr.build.alert{class: build_status_alert_class(build)}
+ %tr.build.alert{class: build_status_css_class(build)}
%td.status
= build.status
diff --git a/app/views/ci/builds/_build.html.haml b/app/views/ci/builds/_build.html.haml
index da306c9f020..a53c64ba3f5 100644
--- a/app/views/ci/builds/_build.html.haml
+++ b/app/views/ci/builds/_build.html.haml
@@ -1,4 +1,4 @@
-%tr.build.alert{class: build_status_alert_class(build)}
+%tr.build{class: build_status_css_class(build)}
%td.status
= build.status
diff --git a/app/views/ci/builds/show.html.haml b/app/views/ci/builds/show.html.haml
index d1e955b5012..2a08bf14f43 100644
--- a/app/views/ci/builds/show.html.haml
+++ b/app/views/ci/builds/show.html.haml
@@ -21,7 +21,7 @@
.row
.col-md-9
- .build-head.alert{class: build_status_alert_class(@build)}
+ .build-head.alert{class: build_status_css_class(@build)}
%h4
- if @build.commit.tag?
Build for tag
@@ -150,7 +150,7 @@
%h4.title #{pluralize(@builds.count, "other build")} for #{@build.short_sha}:
%table.builds
- @builds.each_with_index do |build, i|
- %tr.build.alert{class: build_status_alert_class(build)}
+ %tr.build.alert{class: build_status_css_class(build)}
%td
= link_to ci_project_build_url(@project, build) do
%span ##{build.id}
diff --git a/app/views/ci/commits/_commit.html.haml b/app/views/ci/commits/_commit.html.haml
index c1b1988d147..aa116fa12dc 100644
--- a/app/views/ci/commits/_commit.html.haml
+++ b/app/views/ci/commits/_commit.html.haml
@@ -1,4 +1,4 @@
-%tr.build.alert{class: commit_status_alert_class(commit)}
+%tr.build{class: commit_status_css_class(commit)}
%td.status
= commit.status
- if commit.running?
diff --git a/app/views/ci/commits/show.html.haml b/app/views/ci/commits/show.html.haml
index 1aeb557314a..8f75d95b214 100644
--- a/app/views/ci/commits/show.html.haml
+++ b/app/views/ci/commits/show.html.haml
@@ -44,7 +44,7 @@
%h3 Status
-.build.alert{class: commit_status_alert_class(@commit)}
+.build.alert{class: commit_status_css_class(@commit)}
.status
= @commit.status.titleize
diff --git a/app/views/ci/projects/_project.html.haml b/app/views/ci/projects/_project.html.haml
index e4a811119e1..47415265b44 100644
--- a/app/views/ci/projects/_project.html.haml
+++ b/app/views/ci/projects/_project.html.haml
@@ -1,5 +1,5 @@
- last_commit = project.last_commit
-%tr.alert{class: commit_status_alert_class(last_commit) }
+%tr{class: commit_status_css_class(last_commit) }
%td
= link_to [:ci, project] do
= project.name
View Lorry Controller Status