rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

(Fixes #22414) Rename for consistency $custom-checkbox-radius, $custom-checkbox-checked-icon, $custom-checkbox-indeterminate-indicator-color, $custom-checkbox-indeterminate-icon, $custom-radio-radius, $custom-radio-checked-icon, $custom-select-sm-font-size, to $custom-checkbox-border-radius, $custom-checkbox-icon-checked, $custom-checkbox-indicator-indeterminate-color, $custom-checkbox-icon-indeterminate, $custom-radio-border-radius, $custom-radio-icon-checked, $custom-select-font-size-sm respectively

Browse Source
This commit is contained in:
Patrick Yeo 2017-06-08 20:14:50 -07:00 committed by Mark Otto
parent a362d62d31
commit d7867377d9
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scss/_custom-forms.scss
View File

@ -76,16 +76,16 @@
.custom-checkbox { .custom-checkbox {
.custom-control-indicator { .custom-control-indicator {
@include border-radius($custom-checkbox-radius); @include border-radius($custom-checkbox-border-radius);
} }
.custom-control-input:checked ~ .custom-control-indicator { .custom-control-input:checked ~ .custom-control-indicator {
background-image: $custom-checkbox-checked-icon; background-image: $custom-checkbox-icon-checked;
} }
.custom-control-input:indeterminate ~ .custom-control-indicator { .custom-control-input:indeterminate ~ .custom-control-indicator {
background-color: $custom-checkbox-indeterminate-bg; background-color: $custom-checkbox-indeterminate-bg;
background-image: $custom-checkbox-indeterminate-icon; background-image: $custom-checkbox-icon-indeterminate;
@include box-shadow($custom-checkbox-indeterminate-box-shadow); @include box-shadow($custom-checkbox-indeterminate-box-shadow);
} }
} }
@ -96,11 +96,11 @@
.custom-radio { .custom-radio {
.custom-control-indicator { .custom-control-indicator {
border-radius: $custom-radio-radius; border-radius: $custom-radio-border-radius;
} }
.custom-control-input:checked ~ .custom-control-indicator { .custom-control-input:checked ~ .custom-control-indicator {
background-image: $custom-radio-checked-icon; background-image: $custom-radio-icon-checked;
} }
} }
@ -175,7 +175,7 @@
.custom-select-sm { .custom-select-sm {
padding-top: $custom-select-padding-y; padding-top: $custom-select-padding-y;
padding-bottom: $custom-select-padding-y; padding-bottom: $custom-select-padding-y;
font-size: $custom-select-sm-font-size; font-size: $custom-select-font-size-sm;
// &:not([multiple]) { // &:not([multiple]) {
// height: 26px; // height: 26px;

14
scss/_variables.scss
View File

@ -457,16 +457,16 @@ $custom-control-indicator-active-color: $white !default;
$custom-control-indicator-active-bg: lighten($brand-primary, 35%) !default; $custom-control-indicator-active-bg: lighten($brand-primary, 35%) !default;
$custom-control-indicator-active-box-shadow: none !default; $custom-control-indicator-active-box-shadow: none !default;
$custom-checkbox-radius: $border-radius !default; $custom-checkbox-border-radius: $border-radius !default;
$custom-checkbox-checked-icon: 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-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: $brand-primary !default; $custom-checkbox-indeterminate-bg: $brand-primary !default;
$custom-checkbox-indeterminate-indicator-color: $custom-control-indicator-checked-color !default; $custom-checkbox-indicator-indeterminate-color: $custom-control-indicator-checked-color !default;
$custom-checkbox-indeterminate-icon: 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-indeterminate-indicator-color}' d='M0 2h4'/%3E%3C/svg%3E"), "#", "%23") !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-indeterminate-box-shadow: none !default;
$custom-radio-radius: 50% !default; $custom-radio-border-radius: 50% !default;
$custom-radio-checked-icon: 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-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-y: .375rem !default;
$custom-select-padding-x: .75rem !default; $custom-select-padding-x: .75rem !default;
@ -486,7 +486,7 @@ $custom-select-border-radius: $border-radius !default;
$custom-select-focus-border-color: lighten($brand-primary, 25%) !default; $custom-select-focus-border-color: lighten($brand-primary, 25%) !default;
$custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default; $custom-select-focus-box-shadow: inset 0 1px 2px rgba($black, .075), 0 0 5px rgba($custom-select-focus-border-color, .5) !default;
$custom-select-sm-font-size: 75% !default; $custom-select-font-size-sm: 75% !default;
$custom-file-height: 2.5rem !default; $custom-file-height: 2.5rem !default;
$custom-file-width: 14rem !default; $custom-file-width: 14rem !default;