From b2dccb15d79085af2a507b6b9f2c35c0e5770ffa Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 01:00:22 -0700 Subject: fix majority of scss linter errors --- scss/_forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 6eafd53ca..72ec9b03f 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -266,9 +266,9 @@ input[type="checkbox"] { .form-control-warning, .form-control-error { padding-right: ($input-padding-x * 3); + background-repeat: no-repeat; background-position: center right ($input-height * .25); background-size: ($input-height * .65) ($input-height * .65); - background-repeat: no-repeat; } // Form validation states -- cgit v1.2.3 From 5c239aae7d403a186ae87dff553978cb906fcdf7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 26 Aug 2015 01:30:30 -0700 Subject: rm unused $state param from form-control-validation mixin; fixes #17323 [skip sauce] [skip validator] --- scss/_forms.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 72ec9b03f..a4600fdbf 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -273,7 +273,7 @@ input[type="checkbox"] { // Form validation states .has-success { - @include form-control-validation(success, $brand-success); + @include form-control-validation($brand-success); .form-control-success { background-image: url($form-icon-success); @@ -281,7 +281,7 @@ input[type="checkbox"] { } .has-warning { - @include form-control-validation(warning, $brand-warning); + @include form-control-validation($brand-warning); .form-control-warning { background-image: url($form-icon-warning); @@ -289,7 +289,7 @@ input[type="checkbox"] { } .has-error { - @include form-control-validation(error, $brand-danger); + @include form-control-validation($brand-danger); .form-control-error { background-image: url($form-icon-error); -- cgit v1.2.3 From 3e664271279af3b9780e6c7a7b9e607ef491dea1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Aug 2015 22:12:06 +0300 Subject: Less to Sass typos. [ci skip] --- scss/_forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index 72ec9b03f..f8ffed37e 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -384,7 +384,7 @@ input[type="checkbox"] { // Requires wrapping inputs and labels with `.form-group` for proper display of // default HTML form controls and our custom form controls (e.g., input groups). // -// Heads up! This is mixin-ed into `.navbar-form` in navbars.less. +// Heads up! This is mixin-ed into `.navbar-form` in _navbar.scss. .form-inline { -- cgit v1.2.3 From f7b27a02cecf7e4fcdc3a1b7dd33ea7967442ae7 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Thu, 27 Aug 2015 13:10:32 +0100 Subject: Remove all uses of `selector &` If we want to support namespaced import: ```scss .twbs { @import 'bootstrap'; } ``` We cannot use `selector &`, see sass/sass#1817. `fieldset[disabled] &` is not needed as we no longer support IE8. --- scss/_forms.scss | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'scss/_forms.scss') diff --git a/scss/_forms.scss b/scss/_forms.scss index f8ffed37e..5dfefb909 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -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; } } @@ -233,24 +231,21 @@ input[type="radio"], input[type="checkbox"] { &:disabled, - &.disabled, - fieldset[disabled] & { + &.disabled { cursor: $cursor-disabled; } } // These classes are used directly on