diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-07-20 22:21:38 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2017-07-20 22:21:38 +0300 |
commit | d12646e808a250b1130d1ddad3e82546d83c4b55 (patch) | |
tree | 1addd9535d09bfe6f0c30b20394efd964a23b067 /assets/stylesheets | |
parent | b156edfee2b9629ad4751ee2a118a04f824ef9eb (diff) |
rake update[v4-dev]
Diffstat (limited to 'assets/stylesheets')
-rw-r--r-- | assets/stylesheets/bootstrap/_custom-forms.scss | 14 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_print.scss | 10 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 14 |
3 files changed, 15 insertions, 23 deletions
diff --git a/assets/stylesheets/bootstrap/_custom-forms.scss b/assets/stylesheets/bootstrap/_custom-forms.scss index b58fffb..d1fbf95 100644 --- a/assets/stylesheets/bootstrap/_custom-forms.scss +++ b/assets/stylesheets/bootstrap/_custom-forms.scss @@ -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); } } @@ -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; } } diff --git a/assets/stylesheets/bootstrap/_print.scss b/assets/stylesheets/bootstrap/_print.scss index e20219a..7f8d990 100644 --- a/assets/stylesheets/bootstrap/_print.scss +++ b/assets/stylesheets/bootstrap/_print.scss @@ -12,15 +12,7 @@ @media print { *, *::before, - *::after, - p::first-letter, - div::first-letter, - blockquote::first-letter, - li::first-letter, - p::first-line, - div::first-line, - blockquote::first-line, - li::first-line { + *::after { // Bootstrap specific; comment out `color` and `background` //color: #000 !important; // Black prints faster: // http://www.sanbeiji.com/archives/953 diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index 91103b6..f0949ea 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -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; |