Merge branch 'master' into '22604-manual-actions'

# Conflicts:
#   app/assets/stylesheets/pages/pipelines.scss

1 files changed, 14 insertions, 14 deletions

diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index 21df80c01f7..dc90eaeb499 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -10,7 +10,7 @@
 
 @mixin chevron-active {
   .fa-chevron-down {
-    color: $dropdown-toggle-hover-icon-color;
+    color: $gray-darkest;
   }
 }
 
@@ -28,14 +28,14 @@
   .dropdown-toggle,
   .dropdown-menu-toggle {
     @include chevron-active;
-    border-color: $dropdown-toggle-hover-border-color;
+    border-color: $gray-darkest;
   }
 }
 
 .dropdown-toggle {
   padding: 6px 8px 6px 10px;
-  background-color: $dropdown-toggle-bg;
-  color: $dropdown-toggle-color;
+  background-color: $white-light;
+  color: $gl-text-color;
   font-size: 14px;
   text-align: left;
   border: 1px solid $border-color;
@@ -73,7 +73,7 @@
   }
 
   .fa {
-    color: $dropdown-toggle-icon-color;
+    color: $gray-darkest;
   }
 
   .fa-chevron-down {
@@ -85,7 +85,7 @@
 
   &:hover {
     @include chevron-active;
-    border-color: $dropdown-toggle-hover-border-color;
+    border-color: $gray-darkest;
   }
 
   &:focus:active {
@@ -131,7 +131,7 @@
   font-size: 14px;
   font-weight: normal;
   padding: 8px 0;
-  background-color: $dropdown-bg;
+  background-color: $white-light;
   border: 1px solid $dropdown-border-color;
   border-radius: $border-radius-base;
   box-shadow: 0 2px 4px $dropdown-shadow-color;
@@ -202,7 +202,7 @@
     }
 
     .icon-play {
-      fill: $table-text-gray;
+      fill: $gl-gray-light;
       margin-right: 6px;
       height: 12px;
       width: 11px;
@@ -210,7 +210,7 @@
   }
 
   .dropdown-header {
-    color: $dropdown-header-color;
+    color: $gl-gray-light;
     font-size: 13px;
     line-height: 22px;
     padding: 0 10px;
@@ -223,7 +223,7 @@
   .unclickable {
     cursor: not-allowed;
     padding: 5px 8px;
-    color: $dropdown-header-color;
+    color: $gl-gray-light;
   }
 }
 
@@ -602,14 +602,14 @@
 
   th {
     padding: 2px 0;
-    color: $calendar-header-color;
+    color: $note-disabled-comment-color;
     font-weight: normal;
     text-transform: lowercase;
     border-top: 1px solid $calendar-border-color;
   }
 
   .ui-datepicker-unselectable {
-    background-color: $calendar-unselectable-bg;
+    background-color: $gray-light;
   }
 }
 
@@ -621,11 +621,11 @@
 
 .dropdown-menu-inner-content {
   display: block;
-  color: $gl-placeholder-color;
+  color: $gl-gray-light;
 }
 
 .dropdown-toggle-text {
   &.is-default {
-    color: $gl-placeholder-color;
+    color: $gl-gray-light;
   }
 }