From 890c6041f3bf70b76244611916bc1286a8150bd5 Mon Sep 17 00:00:00 2001
From: naicko <nico.vandenwinckel@retailsonar.com>
Date: Sat, 18 Mar 2017 21:06:05 +0100
Subject: Update scss mixins to comply with scss-linting rules (#22151)

* Fixed some linting issues

* Run npm tasks after scss cleanup

* Revert "Run npm tasks after scss cleanup"

This reverts commit 1103a0da68d1846ad592eb4a105046a939557830.

* Property sort order for grid

* Let's respest the property order in the mixins

* Respect property sort order in reboot file

* ::-ms-expand is a vendor-prefix, add it to the scss-lint disable

* Revert hover mixin comment

* Fixed missing mixin hover-focus
---
 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 39f164822..da40d7c50 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -1,4 +1,4 @@
-// scss-lint:disable PropertyCount
+// scss-lint:disable PropertyCount, VendorPrefix
 
 // Embedded icons from Open Iconic.
 // Released under MIT and copyright 2014 Waybury.
-- 
cgit v1.2.3


From 6f42daf747f094188478bc76b83ce998c2a87e19 Mon Sep 17 00:00:00 2001
From: Theriault <dustintheriault@gmail.com>
Date: Sat, 18 Mar 2017 14:23:10 -0600
Subject: Add :empty to .custom-file-control selector (#22176)

<label class="custom-file"><input type="file" class="custom-file-input" /><span class="custom-file-control"></span></label>
VS
<label class="custom-file"><input type="file" class="custom-file-input" /><span class="custom-file-control">test.txt</span></label>
---
 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 da40d7c50..d303c48d0 100644
--- a/scss/_custom-forms.scss
+++ b/scss/_custom-forms.scss
@@ -229,7 +229,7 @@
   @include box-shadow($custom-file-box-shadow);
 
   @each $lang, $text in map-get($custom-file-text, placeholder) {
-    &:lang(#{$lang})::after {
+    &:lang(#{$lang}):empty::after {
       content: $text;
     }
   }
-- 
cgit v1.2.3