From: Mark Otto <markdotto@gmail.com>
Date: Sun, 14 Jan 2018 02:58:48 +0000 (-0800)
Subject: Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
X-Git-Tag: v4.0.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38271b21d5ec7db354c96d3f9eaafdb9a68560aa;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
---

38271b21d5ec7db354c96d3f9eaafdb9a68560aa
diff --cc scss/_variables.scss
index b903f5f589,300b1a7f08..6973f2921c
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -447,9 -447,8 +447,9 @@@ $custom-control-indicator-box-shadow
  $custom-control-indicator-disabled-bg:          $gray-200 !default;
  $custom-control-label-disabled-color:     $gray-600 !default;
  
- $custom-control-indicator-checked-color:        $white !default;
- $custom-control-indicator-checked-bg:           theme-color("primary") !default;
+ $custom-control-indicator-checked-color:        $component-active-color !default;
+ $custom-control-indicator-checked-bg:           $component-active-bg !default;
 +$custom-control-indicator-checked-disabled-bg:  rgba(theme-color("primary"), .5) !default;
  $custom-control-indicator-checked-box-shadow:   none !default;
  
  $custom-control-indicator-focus-box-shadow:     0 0 0 1px $body-bg, $input-btn-focus-box-shadow !default;