From ac3fbdad3626c4c43303c168f3109c09da688b8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Dorrestijn?= Date: Fri, 21 Aug 2015 22:21:20 +0200 Subject: Removed mixin from focus ouline box-shadow fixes #17066 --- scss/_custom-forms.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index ec211acaa..2326e01ca 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -19,16 +19,16 @@ z-index: -1; // Put the input behind the label so it doesn't overlay text opacity: 0; - &:focus ~ .c-indicator { - @include box-shadow(0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9); - } - &:checked ~ .c-indicator { color: #fff; background-color: #0074d9; @include box-shadow(none); } + &:focus ~ .c-indicator { + box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9; + } + &:active ~ .c-indicator { color: #fff; background-color: #84c6ff; -- cgit v1.2.3 From c49503165a301e53583dcb74003e2894d966269b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corn=C3=A9=20Dorrestijn?= Date: Sat, 22 Aug 2015 01:04:16 +0200 Subject: Added comment explaining why there is no mixin here --- scss/_custom-forms.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 2326e01ca..bc36013e9 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -26,6 +26,7 @@ } &:focus ~ .c-indicator { + // the mixin is not used here to make sure there is feedback box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9; } -- cgit v1.2.3 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/_custom-forms.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index bc36013e9..5cdf45e20 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -132,7 +132,7 @@ max-width: 100%; padding: .375rem 1.75rem .375rem .75rem; vertical-align: middle; - background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; + background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; background-size: 8px 10px; border: 1px solid $input-border; @@ -146,8 +146,8 @@ background-image: none \9; &:focus { - outline: none; border-color: #51a7e8; + outline: none; box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5); } -- cgit v1.2.3 From 6f8f4cc92c67dadfcadd2c50db56aa47cea26edc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 01:03:51 -0700 Subject: there is no standard appearance property --- scss/_custom-forms.scss | 1 - 1 file changed, 1 deletion(-) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 5cdf45e20..50731111f 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -139,7 +139,6 @@ // Have to include vendor prefixes as the `appearance` property isn't part of the CSS spec. -webkit-appearance: none; -moz-appearance: none; - appearance: none; // IE9 hacks to hide the background-image and reduce padding padding-right: .75rem \9; -- cgit v1.2.3 From a5bfbe0fcad5334e68d236f0603b685441829656 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 01:12:00 -0700 Subject: fix remaining scss lint errors --- scss/_custom-forms.scss | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 50731111f..c63c9c185 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -126,23 +126,22 @@ // // Replaces the browser default select with a custom one, mostly pulled from // http://primercss.io. +// +// Includes IE9-specific hacks (noted by ` \9`). .c-select { display: inline-block; max-width: 100%; padding: .375rem 1.75rem .375rem .75rem; + padding-right: .75rem \9; vertical-align: middle; background: #fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right .75rem center; + background-image: none \9; background-size: 8px 10px; border: 1px solid $input-border; - - // Have to include vendor prefixes as the `appearance` property isn't part of the CSS spec. - -webkit-appearance: none; + // Use vendor prefixes as `appearance` isn't part of the CSS spec. -moz-appearance: none; - - // IE9 hacks to hide the background-image and reduce padding - padding-right: .75rem \9; - background-image: none \9; + -webkit-appearance: none; &:focus { border-color: #51a7e8; -- cgit v1.2.3 From 7d194a9bd34394406ff44cef90f43c94849d6939 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 23 Aug 2015 23:13:14 -0700 Subject: wrap box-shadows in mixin in custom forms. fixes #17242 --- scss/_custom-forms.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index c63c9c185..0565f2f75 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -146,7 +146,7 @@ &:focus { border-color: #51a7e8; outline: none; - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5); + @include box-shadow(inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(81, 167, 232, 0.5)); } // Hides the default caret in IE11 @@ -197,7 +197,7 @@ background-color: #fff; border: .075rem solid #ddd; border-radius: .25rem; - box-shadow: inset 0 .2rem .4rem rgba(0,0,0,.05); + @include box-shadow(inset 0 .2rem .4rem rgba(0,0,0,.05)); } .file-custom:after { content: "Choose file..."; @@ -221,5 +221,5 @@ // Focus state .file input:focus ~ .file-custom { - box-shadow: 0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9; + @include box-shadow(0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9); } -- cgit v1.2.3 From d51f0a4f816534e8c39ff58d8d4c562d2dd568fb Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Wed, 19 Aug 2015 16:31:31 -0400 Subject: Use double colons for psuedo elements Fix #17052 --- scss/_custom-forms.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 0565f2f75..34dfc48e7 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -109,7 +109,7 @@ .c-input { display: inline; - &:after { + &::after { display: block; margin-bottom: .25rem; content: ""; @@ -199,10 +199,10 @@ border-radius: .25rem; @include box-shadow(inset 0 .2rem .4rem rgba(0,0,0,.05)); } -.file-custom:after { +.file-custom::after { content: "Choose file..."; } -.file-custom:before { +.file-custom::before { position: absolute; top: -.075rem; right: -.075rem; -- cgit v1.2.3 From 9420297dc2e548fe70250a0e5c5f40dfb8a73eda Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 25 Aug 2015 08:49:45 +0300 Subject: SCSS lint fixes. [ci skip] --- scss/_custom-forms.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scss/_custom-forms.scss') diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 34dfc48e7..1fec265c6 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -180,7 +180,7 @@ .file input { min-width: 14rem; margin: 0; - filter: alpha(opacity=0); + filter: alpha(opacity = 0); opacity: 0; } .file-custom { -- cgit v1.2.3