rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #17364 from twbs/avoid-parent-selector-suffix2

Browse Source 
Remove all uses of `selector &` to support nested import
This commit is contained in:
Gleb Mazovetskiy 2015-09-05 10:14:59 +01:00
commit 79aebf6c1d
4 changed files with 15 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scss/_buttons.scss
View File

@ -39,8 +39,7 @@
} }
&.disabled, &.disabled,
&:disabled, &:disabled {
fieldset[disabled] & {
cursor: $cursor-disabled; cursor: $cursor-disabled;
opacity: .65; opacity: .65;
@include box-shadow(none); @include box-shadow(none);
@ -111,8 +110,7 @@ fieldset[disabled] a.btn {
&, &,
&:active, &:active,
&.active, &.active,
&:disabled, &:disabled {
fieldset[disabled] & {
background-color: transparent; background-color: transparent;
@include box-shadow(none); @include box-shadow(none);
} }
@ -129,8 +127,7 @@ fieldset[disabled] a.btn {
text-decoration: $link-hover-decoration; text-decoration: $link-hover-decoration;
background-color: transparent; background-color: transparent;
} }
&:disabled, &:disabled {
fieldset[disabled] & {
@include hover-focus { @include hover-focus {
color: $btn-link-disabled-color; color: $btn-link-disabled-color;
text-decoration: none; text-decoration: none;

15
scss/_forms.scss
View File

@ -50,15 +50,13 @@
// disabled if the fieldset is disabled. Due to implementation difficulty, we // disabled if the fieldset is disabled. Due to implementation difficulty, we
// don't honor that edge case; we style them as disabled anyway. // don't honor that edge case; we style them as disabled anyway.
&:disabled, &:disabled,
&[readonly], &[readonly] {
fieldset[disabled] & {
background-color: $input-bg-disabled; background-color: $input-bg-disabled;
// iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655. // iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.
opacity: 1; opacity: 1;
} }
&[disabled], &:disabled {
fieldset[disabled] & {
cursor: $cursor-disabled; cursor: $cursor-disabled;
} }
} }
@ -233,24 +231,21 @@
input[type="radio"], input[type="radio"],
input[type="checkbox"] { input[type="checkbox"] {
&:disabled, &:disabled,
&.disabled, &.disabled {
fieldset[disabled] & {
cursor: $cursor-disabled; cursor: $cursor-disabled;
} }
} }
// These classes are used directly on <label>s // These classes are used directly on <label>s
.radio-inline, .radio-inline,
.checkbox-inline { .checkbox-inline {
&.disabled, &.disabled {
fieldset[disabled] & {
cursor: $cursor-disabled; cursor: $cursor-disabled;
} }
} }
// These classes are used on elements with <label> descendants // These classes are used on elements with <label> descendants
.radio, .radio,
.checkbox { .checkbox {
&.disabled, &.disabled {
fieldset[disabled] & {
label { label {
cursor: $cursor-disabled; cursor: $cursor-disabled;
} }

6
scss/_labels.scss
View File

@ -19,12 +19,12 @@
&:empty { &:empty {
display: none; display: none;
} }
}
// Quick fix for labels in buttons // Quick fix for labels in buttons
.btn & { .btn .label {
position: relative; position: relative;
top: -1px; top: -1px;
}
} }
// Add hover effects, but only for links // Add hover effects, but only for links

6
scss/mixins/_buttons.scss
View File

@ -45,8 +45,7 @@
} }
&.disabled, &.disabled,
&:disabled, &:disabled {
fieldset[disabled] & {
&:focus, &:focus,
&.focus { &.focus {
background-color: $background; background-color: $background;
@ -81,8 +80,7 @@
} }
&.disabled, &.disabled,
&:disabled, &:disabled {
fieldset[disabled] & {
&:focus, &:focus,
&.focus { &.focus {
border-color: lighten($color, 20%); border-color: lighten($color, 20%);