Merge pull request #19011 from twbs/scss-lint

Bump SCSS-Lint, and `bundle update`
twbs · Jan 23, 2016 · a26b4bb · a26b4bb
2 parents 903503b + 7e2e31e
commit a26b4bb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,5 +8,5 @@ group :development, :test do
   gem 'jekyll-redirect-from', '~> 0.9.0'
   gem 'jekyll-sitemap', '~> 0.9.0'
   gem 'sass', '~> 3.4.19'
-  gem 'scss_lint', '~> 0.43'
+  gem 'scss_lint', '~> 0.44.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -4,7 +4,7 @@ GEM
     colorator (0.1)
     ffi (1.9.10)
     ffi (1.9.10-x64-mingw32)
-    jekyll (3.0.1)
+    jekyll (3.0.2)
       colorator (~> 0.1)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
@@ -13,28 +13,28 @@ GEM
       mercenary (~> 0.3.3)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-redirect-from (0.9.0)
+    jekyll-redirect-from (0.9.1)
       jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
     jekyll-sitemap (0.9.0)
-    jekyll-watch (1.3.0)
+    jekyll-watch (1.3.1)
       listen (~> 3.0)
     kramdown (1.9.0)
     liquid (3.0.6)
     listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
-    rainbow (2.0.0)
-    rb-fsevent (0.9.6)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rouge (1.10.1)
     safe_yaml (1.0.4)
-    sass (3.4.19)
-    scss_lint (0.43.2)
-      rainbow (~> 2.0)
+    sass (3.4.21)
+    scss_lint (0.44.0)
+      rake (~> 10.0)
       sass (~> 3.4.15)
 
 PLATFORMS
@@ -46,7 +46,7 @@ DEPENDENCIES
   jekyll-redirect-from (~> 0.9.0)
   jekyll-sitemap (~> 0.9.0)
   sass (~> 3.4.19)
-  scss_lint (~> 0.43)
+  scss_lint (~> 0.44.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2
diff --git a/scss/_forms.scss b/scss/_forms.scss
@@ -92,8 +92,6 @@
 //
 // Note that as of 8.3, iOS doesn't support `week`.
 
-// SCSS-Lint exemption until https://github.com/brigade/scss-lint/pull/672 gets merged
-// scss-lint:disable PseudoElement
 _::-webkit-full-page-media, // Hack to make this CSS be Safari-only; see http://browserbu.gs/css-hacks/webkit-full-page-media/
 input[type="date"],
 input[type="time"],
@@ -113,7 +111,6 @@ input[type="month"] {
     line-height: $input-height-lg;
   }
 }
-// scss-lint:enable PseudoElement
 
 
 // Static form control text