summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2015-10-22 11:44:12 +0000
committerRobert Speicher <robert@gitlab.com>2015-10-22 11:44:12 +0000
commit0bb2e946741026cbb127ed7b22f5785552407d2d (patch)
tree7fc073ef516fb4852bd3efe824b24022e2fa28ac
parentae9f81a9501f401133c9ba70e84a2148cd92f1ee (diff)
parent337b6632b643e4eb0417e42302a347ea87a2315c (diff)
downloadgitlab-ce-0bb2e946741026cbb127ed7b22f5785552407d2d.tar.gz
Merge branch 'fix-css-for-runner' into 'master'
Fix CSS class for runner status Fixes #3117 See merge request !1665
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/runners.scss52
2 files changed, 26 insertions, 27 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9a550ca1139..ebee45ace9e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -13,6 +13,7 @@ v 8.1.0
- Ensure MySQL CI limits DB migrations occur after the fields have been created (Stan Hu)
- Fix duplicate repositories in GitHub import page (Stan Hu)
- Redirect to a default path if HTTP_REFERER is not set (Stan Hu)
+ - Fix CSS for runner status
- Send an email to admin email when a user is reported for spam (Jonathan Rochkind)
- Show notifications button when user is member of group rather than project (Grzegorz Bizon)
- Fix bug preventing mentioned issued from being closed when MR is merged using fast-forward merge.
diff --git a/app/assets/stylesheets/pages/runners.scss b/app/assets/stylesheets/pages/runners.scss
index 2b15ab83129..a9111a7388f 100644
--- a/app/assets/stylesheets/pages/runners.scss
+++ b/app/assets/stylesheets/pages/runners.scss
@@ -1,36 +1,34 @@
-.ci-body {
- .runner-state {
- padding: 6px 12px;
- margin-right: 10px;
- color: #FFF;
+.runner-state {
+ padding: 6px 12px;
+ margin-right: 10px;
+ color: #FFF;
- &.runner-state-shared {
- background: #32b186;
- }
- &.runner-state-specific {
- background: #3498db;
- }
+ &.runner-state-shared {
+ background: #32b186;
}
-
- .runner-status-online {
- color: green;
+ &.runner-state-specific {
+ background: #3498db;
}
+}
- .runner-status-offline {
- color: gray;
- }
+.runner-status-online {
+ color: green;
+}
- .runner-status-paused {
- color: red;
- }
+.runner-status-offline {
+ color: gray;
+}
+
+.runner-status-paused {
+ color: red;
+}
- .runner {
- .btn {
- padding: 1px 6px;
- }
+.runner {
+ .btn {
+ padding: 1px 6px;
+ }
- h4 {
- font-weight: normal;
- }
+ h4 {
+ font-weight: normal;
}
}