From: Mark Otto <markdotto@gmail.com>
Date: Tue, 20 Dec 2016 04:54:41 +0000 (-0800)
Subject: Merge branch '14840-consistent-colors' of https://github.com/Kovah/bootstrap into... 
X-Git-Tag: v4.0.0-alpha.6~319
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be4fc23fdb12b19f763ee11ff1ed7370318ca156;p=thirdparty%2Fbootstrap.git

Merge branch '14840-consistent-colors' of https://github.com/Kovah/bootstrap into Kovah-14840-consistent-colors
---

be4fc23fdb12b19f763ee11ff1ed7370318ca156
diff --cc scss/_variables.scss
index 64026c1c25,dd342fdd5a..e5add5d18f
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -409,12 -327,12 +409,12 @@@ $input-border-radius:            $borde
  $input-border-radius-lg:         $border-radius-lg !default;
  $input-border-radius-sm:         $border-radius-sm !default;
  
 -$input-bg-focus:                 $input-bg;
 +$input-bg-focus:                 $input-bg !default;
- $input-border-focus:             #66afe9 !default;
- $input-box-shadow-focus:         $input-box-shadow, 0 0 8px rgba($input-border-focus,.6) !default;
+ $input-border-focus:             lighten($brand-primary, 25%) !default;
 -$input-box-shadow-focus:         rgba($input-border-focus, .6) !default;
 -$input-color-focus:              $input-color;
++$input-box-shadow-focus:         $input-box-shadow, rgba($input-border-focus, .6) !default;
 +$input-color-focus:              $input-color !default;
  
- $input-color-placeholder:        #999 !default;
+ $input-color-placeholder:        $gray-light !default;
  
  $input-padding-x-sm:             .5rem !default;
  $input-padding-y-sm:             .25rem !default;
@@@ -459,11 -375,9 +459,11 @@@ $custom-control-active-indicator-bg
  $custom-control-active-indicator-box-shadow: none !default;
  
  $custom-checkbox-radius: $border-radius !default;
 -$custom-checkbox-checked-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E") !default;
 +$custom-checkbox-checked-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-checked-indicator-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
 +
- $custom-checkbox-indeterminate-bg: #0074d9 !default;
+ $custom-checkbox-indeterminate-bg: $brand-primary !default;
 -$custom-checkbox-indeterminate-icon: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='%23fff' d='M0 2h4'/%3E%3C/svg%3E") !default;
 +$custom-checkbox-indeterminate-indicator-color: $custom-control-checked-indicator-color !default;
 +$custom-checkbox-indeterminate-icon: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indeterminate-indicator-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
  $custom-checkbox-indeterminate-box-shadow: none !default;
  
  $custom-radio-radius: 50% !default;
@@@ -535,8 -443,8 +535,8 @@@ $dropdown-margin-top:            .125re
  $dropdown-bg:                    #fff !default;
  $dropdown-border-color:          rgba(0,0,0,.15) !default;
  $dropdown-border-width:          $border-width !default;
- $dropdown-divider-bg:            #e5e5e5 !default;
+ $dropdown-divider-bg:            $gray-lighter !default;
 -$dropdown-box-shadow:            0 6px 12px rgba(0,0,0,.175) !default;
 +$dropdown-box-shadow:            0 .5rem 1rem rgba(0,0,0,.175) !default;
  
  $dropdown-link-color:            $gray-dark !default;
  $dropdown-link-hover-color:      darken($gray-dark, 5%) !default;
@@@ -815,10 -707,10 +815,10 @@@ $alert-danger-text:           $state-da
  $alert-danger-border:         $state-danger-border !default;
  
  
 -// Progress bars
 +// 27. Progress bars
  
- $progress-bg:                 #eee !default;
- $progress-bar-color:          #0074d9 !default;
+ $progress-bg:                 $gray-lightest !default;
+ $progress-bar-color:          $brand-primary !default;
  $progress-border-radius:      $border-radius !default;
  $progress-box-shadow:         inset 0 .1rem .1rem rgba(0,0,0,.1) !default;