Merge branch 'ee-49807-consolidate-sass-variables' into 'master'

ee-49807 consolidate sass variables

See merge request gitlab-org/gitlab-ee!6862

app/assets/stylesheets/bootstrap_migration.scss

@@ -14,7 +14,6 @@ $border-radius-base: 3px !default;
 
 $modal-body-bg: $white-light;
 $input-border: $border-color;
-$input-border-focus: $focus-border-color;
 
 $padding-base-vertical: $gl-vert-padding;
 $padding-base-horizontal: $gl-padding;

app/assets/stylesheets/framework.scss

 
 @import 'framework/variables';
+@import 'framework/variables_overrides';
 @import 'framework/mixins';
 
 @import 'bootstrap';

app/assets/stylesheets/framework/buttons.scss

@@ -350,7 +350,7 @@
   &:focus {
     cursor: text;
     box-shadow: none;
-    border-color: lighten($dropdown-input-focus-border, 20%);
+    border-color: lighten($blue-300, 20%);
     color: $gray-darkest;
     background-color: $gray-light;
   }

app/assets/stylesheets/framework/dropdowns.scss

@@ -615,7 +615,7 @@
 
   &:focus {
     color: $dropdown-link-color;
-    border-color: $dropdown-input-focus-border;
+    border-color: $blue-300;
     box-shadow: 0 0 4px $dropdown-input-focus-shadow;
 
     ~ .fa {

app/assets/stylesheets/framework/filters.scss

@@ -205,7 +205,7 @@
 
   &.focus,
   &.focus:hover {
-    border-color: $dropdown-input-focus-border;
+    border-color: $blue-300;
     box-shadow: 0 0 4px $search-input-focus-shadow-color;
   }
 
@@ -294,7 +294,7 @@
   &:hover,
   &:focus {
     color: $gl-text-color;
-    border-color: $dropdown-input-focus-border;
+    border-color: $blue-300;
     outline: none;
   }
 

app/assets/stylesheets/framework/selects.scss

@@ -153,7 +153,7 @@
     transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
 
     &:focus {
-      border-color: $input-border-focus;
+      border-color: $blue-300;
     }
 
     &.select2-active {

app/assets/stylesheets/framework/variables.scss

@@ -178,7 +178,6 @@ $border-gray-dark: darken($white-normal, $darken-border-factor);
  * UI elements
  */
 $border-color: #e5e5e5;
-$focus-border-color: $blue-300;
 $well-expand-item: #e8f2f7;
 $well-inner-border: #eef0f2;
 $well-light-border: #f1f1f1;
@@ -404,8 +403,7 @@ $dropdown-divider-color: rgba(#000, 0.1);
 $dropdown-title-btn-color: #bfbfbf;
 $dropdown-input-color: #555;
 $dropdown-input-fa-color: #c7c7c7;
-$dropdown-input-focus-border: $focus-border-color;
-$dropdown-input-focus-shadow: rgba($dropdown-input-focus-border, 0.4);
+$dropdown-input-focus-shadow: rgba($blue-300, 0.4);
 $dropdown-loading-bg: rgba(#fff, 0.6);
 $dropdown-chevron-size: 10px;
 $dropdown-toggle-active-border-color: darken($border-color, 14%);
@@ -873,19 +871,3 @@ Prometheus
 $prometheus-table-row-highlight-color: $theme-gray-100;
 
 $priority-label-empty-state-width: 114px;
-
-/*
- * Override Bootstrap 4 variables
- */
-
-$secondary: $gray-light;
-$input-disabled-bg: $gray-light;
-$input-border-color: $theme-gray-200;
-$input-color: $gl-text-color;
-$font-family-sans-serif: $regular-font;
-$font-family-monospace: $monospace-font;
-$input-line-height: 20px;
-$btn-line-height: 20px;
-$table-accent-bg: $gray-light;
-$card-border-color: $border-color;
-$card-cap-bg: $gray-light;

app/assets/stylesheets/framework/variables_overrides.scss

+/*
+ * This file is only for overriding Bootstrap 4 variables.
+ * Please add any new variables to variables.scss
+ */
+
+$secondary: $gray-light;
+$input-disabled-bg: $gray-light;
+$input-border-color: $theme-gray-200;
+$input-color: $gl-text-color;
+$font-family-sans-serif: $regular-font;
+$font-family-monospace: $monospace-font;
+$input-line-height: 20px;
+$btn-line-height: 20px;
+$table-accent-bg: $gray-light;
+$card-border-color: $border-color;
+$card-cap-bg: $gray-light;

app/assets/stylesheets/pages/issuable.scss

@@ -945,7 +945,7 @@
 
   &.focus,
   &.focus:hover {
-    border-color: $dropdown-input-focus-border;
+    border-color: $blue-300;
     box-shadow: 0 0 4px $search-input-focus-shadow-color;
   }
 }

app/assets/stylesheets/pages/note_form.scss

@@ -69,7 +69,7 @@
 
       .comment-toolbar,
       .nav-links {
-        border-color: $focus-border-color;
+        border-color: $blue-300;
       }
     }
 

app/assets/stylesheets/pages/search.scss

@@ -23,7 +23,7 @@ $search-avatar-size: 16px;
 .search-text-input:hover,
 .form-control:hover,
 :not[readonly] {
-  border-color: lighten($dropdown-input-focus-border, 20%);
+  border-color: lighten($blue-300, 20%);
   box-shadow: 0 0 4px lighten($search-input-focus-shadow-color, 20%);
 }
 
@@ -127,7 +127,7 @@ input[type='checkbox']:hover {
   &.search-active {
     form {
       @extend .form-control:focus;
-      border-color: $dropdown-input-focus-border;
+      border-color: $blue-300;
       box-shadow: none;
 
       @include media-breakpoint-up(xl) {

ee/app/assets/stylesheets/framework/sortable.scss

@@ -31,7 +31,7 @@
     }
 
     &:focus {
-      outline: 1px solid $focus-border-color;
+      outline: 1px solid $blue-300;
     }
   }
 }