Skip to content
GitLab
Commit 8d46a950 authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'v4-dev' into v4-grid-redux

parents f127bc68 d5e474b4
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
+2 -2
scss/_variables.scss
+ 2
- 2
View file @ 8d46a950
...@@ -369,7 +369,7 @@ $custom-select-border-color: $input-border-color !default; ...@@ -369,7 +369,7 @@ $custom-select-border-color: $input-border-color !default;
$custom-select-border-radius: $border-radius !default; $custom-select-border-radius: $border-radius !default;
$custom-select-focus-border-color: #51a7e8 !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-padding-y: .2rem !default;
$custom-select-sm-font-size: 75% !default; $custom-select-sm-font-size: 75% !default;
...@@ -581,7 +581,7 @@ $popover-arrow-width: 10px !default; ...@@ -581,7 +581,7 @@ $popover-arrow-width: 10px !default;
$popover-arrow-color: $popover-bg !default; $popover-arrow-color: $popover-bg !default;
$popover-arrow-outer-width: ($popover-arrow-width + 1px) !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 // Labels
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment