Merge branch 'v4-dev' into form-tweaks

diff --cc scss/_custom-forms.scss
Simple merge

diff --cc scss/_variables.scss
index faea8306a4f7a55851d2cd04c78f71f03482c83b,6b00d9b1998d2f7d72de671379625548a50006e5..3cde2bd04394f82bbadf8dea8cb1dab0926182b2
--- 1/scss/_variables.scss
--- 2/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;

diff --cc scss/mixins/_forms.scss
Simple merge