aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-04-08 21:24:03 -0700
committerMark Otto <[email protected]>2017-04-08 21:24:03 -0700
commit01dbc4cc050e0c1635c186932a60329f2214f782 (patch)
tree536773d0986a13bfc7bccebaf5b7537eac6e0c79
parent2dfffbde89b1f8483dce560513f3ab97e6a17e86 (diff)
downloadbootstrap-01dbc4cc050e0c1635c186932a60329f2214f782.tar.xz
bootstrap-01dbc4cc050e0c1635c186932a60329f2214f782.zip
Bump up from 2px to 3px so it's consistent; also fix focus of inputs
-rw-r--r--scss/_variables.scss4
-rw-r--r--scss/mixins/_buttons.scss6
2 files changed, 5 insertions, 5 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index d277011b2..c17339575 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -352,7 +352,7 @@ $input-btn-line-height-lg: 1.5 !default;
$btn-font-weight: $font-weight-normal !default;
$btn-box-shadow: inset 0 1px 0 rgba($white,.15), 0 1px 1px rgba($black,.075) !default;
-$btn-focus-box-shadow: 0 0 0 2px rgba($brand-primary, .25) !default;
+$btn-focus-box-shadow: 0 0 0 3px rgba($brand-primary, .25) !default;
$btn-active-box-shadow: inset 0 3px 5px rgba($black,.125) !default;
$btn-primary-color: $white !default;
@@ -407,7 +407,7 @@ $input-border-radius-sm: $border-radius-sm !default;
$input-bg-focus: $input-bg !default;
$input-border-focus: lighten($brand-primary, 25%) !default;
-$input-box-shadow-focus: $input-box-shadow, rgba($input-border-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 --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 47f2834ff..f5ca3aa71 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -22,9 +22,9 @@
&.focus {
// Avoid using mixin so we can pass custom focus shadow properly
@if $enable-shadows {
- box-shadow: $btn-box-shadow, 0 0 0 2px rgba($border, .5);
+ box-shadow: $btn-box-shadow, 0 0 0 3px rgba($border, .5);
} @else {
- box-shadow: 0 0 0 2px rgba($border, .5);
+ box-shadow: 0 0 0 3px rgba($border, .5);
}
}
@@ -60,7 +60,7 @@
&:focus,
&.focus {
- box-shadow: 0 0 0 2px rgba($color, .5);
+ box-shadow: 0 0 0 3px rgba($color, .5);
}
&.disabled,