Skip to content

Commit

Permalink
(twbs#22414) Rename for consistency $custom-checkbox-border-radius,…
Browse files Browse the repository at this point in the history
… `$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
  • Loading branch information
pat270 committed Jul 14, 2017
1 parent c00437e commit f34a95b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
14 changes: 7 additions & 7 deletions scss/_custom-forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,17 @@

.custom-checkbox {
.custom-control-indicator {
@include border-radius($custom-checkbox-border-radius);
@include border-radius($custom-checkbox-indicator-border-radius);
}

.custom-control-input:checked ~ .custom-control-indicator {
background-image: $custom-checkbox-icon-checked;
background-image: $custom-checkbox-indicator-icon-checked;
}

.custom-control-input:indeterminate ~ .custom-control-indicator {
background-color: $custom-checkbox-indeterminate-bg;
background-image: $custom-checkbox-icon-indeterminate;
@include box-shadow($custom-checkbox-indeterminate-box-shadow);
background-color: $custom-checkbox-indicator-indeterminate-bg;
background-image: $custom-checkbox-indicator-icon-indeterminate;
@include box-shadow($custom-checkbox-indicator-indeterminate-box-shadow);
}
}

Expand All @@ -96,11 +96,11 @@

.custom-radio {
.custom-control-indicator {
border-radius: $custom-radio-border-radius;
border-radius: $custom-radio-indicator-border-radius;
}

.custom-control-input:checked ~ .custom-control-indicator {
background-image: $custom-radio-icon-checked;
background-image: $custom-radio-indicator-icon-checked;
}
}

Expand Down
14 changes: 7 additions & 7 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -422,16 +422,16 @@ $custom-control-indicator-active-color: $white !default;
$custom-control-indicator-active-bg: lighten(theme-color("primary"), 35%) !default;
$custom-control-indicator-active-box-shadow: none !default;

$custom-checkbox-border-radius: $border-radius !default;
$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;
$custom-checkbox-indicator-border-radius: $border-radius !default;
$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;

$custom-checkbox-indeterminate-bg: theme-color("primary") !default;
$custom-checkbox-indicator-indeterminate-bg: theme-color("primary") !default;
$custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;
$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;
$custom-checkbox-indeterminate-box-shadow: none !default;
$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;
$custom-checkbox-indicator-indeterminate-box-shadow: none !default;

$custom-radio-border-radius: 50% !default;
$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;
$custom-radio-indicator-border-radius: 50% !default;
$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;

$custom-select-padding-y: .375rem !default;
$custom-select-padding-x: .75rem !default;
Expand Down

0 comments on commit f34a95b

Please sign in to comment.