Skip to content

Commit 696b2be

Browse files
pat270mdo
authored andcommitted
(#22414) Rename for consistency $custom-checkbox-border-radius, $custom-checkbox-icon-checked, $custom-checkbox-indeterminate-bg, $custom-checkbox-icon-indeterminate, $custom-checkbox-indeterminate-box-shadow, $custom-radio-border-radius, $custom-radio-icon-checked to $custom-checkbox-indicator-border-radius, $custom-checkbox-indicator-icon-checked, $custom-checkbox-indicator-indeterminate-bg, $custom-checkbox-indicator-icon-indeterminate, $custom-checkbox-indicator-indeterminate-box-shadow, $custom-radio-indicator-border-radius, $custom-radio-indicator-icon-checked, respectively
1 parent 21d8909 commit 696b2be

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

scss/_custom-forms.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@
7676

7777
.custom-checkbox {
7878
.custom-control-indicator {
79-
@include border-radius($custom-checkbox-border-radius);
79+
@include border-radius($custom-checkbox-indicator-border-radius);
8080
}
8181

8282
.custom-control-input:checked ~ .custom-control-indicator {
83-
background-image: $custom-checkbox-icon-checked;
83+
background-image: $custom-checkbox-indicator-icon-checked;
8484
}
8585

8686
.custom-control-input:indeterminate ~ .custom-control-indicator {
87-
background-color: $custom-checkbox-indeterminate-bg;
88-
background-image: $custom-checkbox-icon-indeterminate;
89-
@include box-shadow($custom-checkbox-indeterminate-box-shadow);
87+
background-color: $custom-checkbox-indicator-indeterminate-bg;
88+
background-image: $custom-checkbox-indicator-icon-indeterminate;
89+
@include box-shadow($custom-checkbox-indicator-indeterminate-box-shadow);
9090
}
9191
}
9292

@@ -96,11 +96,11 @@
9696

9797
.custom-radio {
9898
.custom-control-indicator {
99-
border-radius: $custom-radio-border-radius;
99+
border-radius: $custom-radio-indicator-border-radius;
100100
}
101101

102102
.custom-control-input:checked ~ .custom-control-indicator {
103-
background-image: $custom-radio-icon-checked;
103+
background-image: $custom-radio-indicator-icon-checked;
104104
}
105105
}
106106

scss/_variables.scss

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -422,16 +422,16 @@ $custom-control-indicator-active-color: $white !default;
422422
$custom-control-indicator-active-bg: lighten(theme-color("primary"), 35%) !default;
423423
$custom-control-indicator-active-box-shadow: none !default;
424424

425-
$custom-checkbox-border-radius: $border-radius !default;
426-
$custom-checkbox-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
425+
$custom-checkbox-indicator-border-radius: $border-radius !default;
426+
$custom-checkbox-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 8'%3E%3Cpath fill='#{$custom-control-indicator-checked-color}' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z'/%3E%3C/svg%3E"), "#", "%23") !default;
427427

428-
$custom-checkbox-indeterminate-bg: theme-color("primary") !default;
428+
$custom-checkbox-indicator-indeterminate-bg: theme-color("primary") !default;
429429
$custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;
430-
$custom-checkbox-icon-indeterminate: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
431-
$custom-checkbox-indeterminate-box-shadow: none !default;
430+
$custom-checkbox-indicator-icon-indeterminate: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 4 4'%3E%3Cpath stroke='#{$custom-checkbox-indicator-indeterminate-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !default;
431+
$custom-checkbox-indicator-indeterminate-box-shadow: none !default;
432432

433-
$custom-radio-border-radius: 50% !default;
434-
$custom-radio-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
433+
$custom-radio-indicator-border-radius: 50% !default;
434+
$custom-radio-indicator-icon-checked: str-replace(url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3E%3Ccircle r='3' fill='#{$custom-control-indicator-checked-color}'/%3E%3C/svg%3E"), "#", "%23") !default;
435435

436436
$custom-select-padding-y: .375rem !default;
437437
$custom-select-padding-x: .75rem !default;

0 commit comments

Comments
 (0)