summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-12-14 17:31:43 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-12-14 17:31:43 +0000
commitacc4b73cb5e3edfed1fa25d461d36b82fe2aacb2 (patch)
tree6410db72b22b7d732ce71b762035ee8e0df2199f /app/assets
parent98a12e535f612339f1af59c9d479b0cdab69df3a (diff)
downloadgitlab-ce-acc4b73cb5e3edfed1fa25d461d36b82fe2aacb2.tar.gz
Remove duplicate color variable
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/stylesheets/framework/variables.scss1
-rw-r--r--app/assets/stylesheets/pages/pipelines.scss11
2 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss
index 3ed19672ec1..710b971615b 100644
--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -578,4 +578,3 @@ Pipeline Graph
*/
$stage-hover-bg: #eaf3fc;
$stage-hover-border: #d1e7fc;
-$stage-badge-text: #e5e5e5;
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index ac18c39dfc4..0124940408a 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -603,10 +603,9 @@
.dropdown-counter-badge {
float: right;
- color: $stage-badge-text;
+ color: $border-color;
font-weight: 100;
font-size: 15px;
- margin-top: 1px;
margin-right: 2px;
}
@@ -687,6 +686,10 @@
height: 18px;
width: 18px;
}
+
+ .ci-status-text {
+ max-width: 95px;
+ }
}
}
}
@@ -697,9 +700,9 @@
margin-top: -4px;
i {
- color: $stage-badge-text;
+ color: $border-color;
border-radius: 100%;
- border: 1px solid $stage-badge-text;
+ border: 1px solid $border-color;
padding: 5px 6px;
font-size: 13px;
background: $white-light;