aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 12:30:03 -0800
committerMark Otto <[email protected]>2016-02-06 12:30:03 -0800
commit8d46a95071ff2ea1348bc27e88a8043338880279 (patch)
treeee60b28beef23b277dba5a5c2d45c4729b2895b2
parentf127bc68a345b16755f068803f9cf31124369440 (diff)
parentd5e474b4ab8fb51d4bf335a026ab56de4dcdb90d (diff)
downloadbootstrap-8d46a95071ff2ea1348bc27e88a8043338880279.tar.xz
bootstrap-8d46a95071ff2ea1348bc27e88a8043338880279.zip
Merge branch 'v4-dev' into v4-grid-redux
-rw-r--r--scss/_variables.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 11a4f4751..557d67d7d 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -369,7 +369,7 @@ $custom-select-border-color: $input-border-color !default;
$custom-select-border-radius: $border-radius !default;
$custom-select-focus-border-color: #51a7e8 !default;
-$custom-select-focus-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5) !default;
+$custom-select-focus-box-shadow: inset 0 1px 2px rgba(0, 0, 0, .075), 0 0 5px rgba(81, 167, 232, .5) !default;
$custom-select-sm-padding-y: .2rem !default;
$custom-select-sm-font-size: 75% !default;
@@ -581,7 +581,7 @@ $popover-arrow-width: 10px !default;
$popover-arrow-color: $popover-bg !default;
$popover-arrow-outer-width: ($popover-arrow-width + 1px) !default;
-$popover-arrow-outer-color: fade-in($popover-border-color, 0.05) !default;
+$popover-arrow-outer-color: fade-in($popover-border-color, .05) !default;
// Labels