From: Mark Otto <markdotto@gmail.com>
Date: Sat, 22 Apr 2017 06:36:24 +0000 (-0700)
Subject: Merge branch 'v4-dev' into form-tweaks
X-Git-Tag: v4.0.0-beta~147^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5463d8436b6404f5c647fb12e0cd0eafa4abf5e0;p=thirdparty%2Fbootstrap.git

Merge branch 'v4-dev' into form-tweaks
---

5463d8436b6404f5c647fb12e0cd0eafa4abf5e0
diff --cc scss/_variables.scss
index faea8306a4,6b00d9b199..3cde2bd043
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -406,8 -406,8 +406,8 @@@ $input-border-radius-lg:         $borde
  $input-border-radius-sm:         $border-radius-sm !default;
  
  $input-bg-focus:                 $input-bg !default;
- $input-border-focus:             lighten($brand-primary, 25%) !default;
+ $input-border-color-focus:       lighten($brand-primary, 25%) !default;
 -$input-box-shadow-focus:         $input-box-shadow, rgba($input-border-color-focus, .6) !default;
 +$input-box-shadow-focus:         $input-box-shadow, $btn-focus-box-shadow !default;
  $input-color-focus:              $input-color !default;
  
  $input-color-placeholder:        $gray-light !default;