Skip to content

Remove all uses of selector & to support nested import #17364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
glebm merged 1 commit into from
Sep 5, 2015
Merged

Remove all uses of selector & to support nested import #17364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions scss/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
}

&.disabled,
&:disabled,
fieldset[disabled] & {
&:disabled {
cursor: $cursor-disabled;
opacity: .65;
@include box-shadow(none);
Expand Down Expand Up @@ -111,8 +110,7 @@ fieldset[disabled] a.btn {
&,
&:active,
&.active,
&:disabled,
fieldset[disabled] & {
&:disabled {
background-color: transparent;
@include box-shadow(none);
}
Expand All @@ -129,8 +127,7 @@ fieldset[disabled] a.btn {
text-decoration: $link-hover-decoration;
background-color: transparent;
}
&:disabled,
fieldset[disabled] & {
&:disabled {
@include hover-focus {
color: $btn-link-disabled-color;
text-decoration: none;
Expand Down
15 changes: 5 additions & 10 deletions scss/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,13 @@
// disabled if the fieldset is disabled. Due to implementation difficulty, we
// don't honor that edge case; we style them as disabled anyway.
&:disabled,
&[readonly],
fieldset[disabled] & {
&[readonly] {
background-color: $input-bg-disabled;
// iOS fix for unreadable disabled content; see https://github.com/twbs/bootstrap/issues/11655.
opacity: 1;
}

&[disabled],
fieldset[disabled] & {
&:disabled {
cursor: $cursor-disabled;
}
}
Expand Down Expand Up @@ -233,24 +231,21 @@
input[type="radio"],
input[type="checkbox"] {
&:disabled,
&.disabled,
fieldset[disabled] & {
&.disabled {
cursor: $cursor-disabled;
}
}
// These classes are used directly on <label>s
.radio-inline,
.checkbox-inline {
&.disabled,
fieldset[disabled] & {
&.disabled {
cursor: $cursor-disabled;
}
}
// These classes are used on elements with <label> descendants
.radio,
.checkbox {
&.disabled,
fieldset[disabled] & {
&.disabled {
label {
cursor: $cursor-disabled;
}
Expand Down
10 changes: 5 additions & 5 deletions scss/_labels.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
&:empty {
display: none;
}
}

// Quick fix for labels in buttons
.btn & {
position: relative;
top: -1px;
}
// Quick fix for labels in buttons
.btn .label {
position: relative;
top: -1px;
}

// Add hover effects, but only for links
Expand Down
6 changes: 2 additions & 4 deletions scss/mixins/_buttons.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
}

&.disabled,
&:disabled,
fieldset[disabled] & {
&:disabled {
&:focus,
&.focus {
background-color: $background;
Expand Down Expand Up @@ -81,8 +80,7 @@
}

&.disabled,
&:disabled,
fieldset[disabled] & {
&:disabled {
&:focus,
&.focus {
border-color: lighten($color, 20%);
Expand Down