Skip to content

Commit 334bef4

Browse files
authored
Merge branch 'v4-dev' into v4-dev-fod-IE11-toasts
2 parents dd918e7 + 4e685e7 commit 334bef4

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

scss/_variables.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -546,15 +546,15 @@ $custom-control-label-disabled-color: $gray-600 !default;
546546
$custom-control-indicator-checked-color: $component-active-color !default;
547547
$custom-control-indicator-checked-bg: $component-active-bg !default;
548548
$custom-control-indicator-checked-disabled-bg: rgba(theme-color("primary"), .5) !default;
549-
$custom-control-indicator-checked-box-shadow: none !default;
549+
$custom-control-indicator-checked-box-shadow: null !default;
550550
$custom-control-indicator-checked-border-color: $custom-control-indicator-checked-bg !default;
551551

552552
$custom-control-indicator-focus-box-shadow: $input-focus-box-shadow !default;
553553
$custom-control-indicator-focus-border-color: $input-focus-border-color !default;
554554

555555
$custom-control-indicator-active-color: $component-active-color !default;
556556
$custom-control-indicator-active-bg: lighten($component-active-bg, 35%) !default;
557-
$custom-control-indicator-active-box-shadow: none !default;
557+
$custom-control-indicator-active-box-shadow: null !default;
558558
$custom-control-indicator-active-border-color: $custom-control-indicator-active-bg !default;
559559

560560
$custom-checkbox-indicator-border-radius: $border-radius !default;
@@ -563,7 +563,7 @@ $custom-checkbox-indicator-icon-checked: url("data:image/svg+xml,<svg xml
563563
$custom-checkbox-indicator-indeterminate-bg: $component-active-bg !default;
564564
$custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;
565565
$custom-checkbox-indicator-icon-indeterminate: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'><path stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/></svg>") !default;
566-
$custom-checkbox-indicator-indeterminate-box-shadow: none !default;
566+
$custom-checkbox-indicator-indeterminate-box-shadow: null !default;
567567
$custom-checkbox-indicator-indeterminate-border-color: $custom-checkbox-indicator-indeterminate-bg !default;
568568

569569
$custom-radio-indicator-border-radius: 50% !default;

scss/mixins/_forms.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
.#{$state}-tooltip {
5454
position: absolute;
5555
top: 100%;
56+
left: 0;
5657
z-index: 5;
5758
display: none;
5859
max-width: 100%; // Contain to parent when possible

0 commit comments

Comments
 (0)