diff options
| author | Chris Rebert <[email protected]> | 2016-01-23 03:11:13 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2016-01-23 03:11:13 -0800 |
| commit | a26b4bb78b6b9f3812aa64d3893cc166153426b4 (patch) | |
| tree | 2ee7ce37ba5a6012475400b9b05d4107f0639b0f | |
| parent | 903503bd47a665d0934f17b2cc3cf35491226f8a (diff) | |
| parent | 7e2e31e9646c16bcdc449e8f8382a616e3e01a6d (diff) | |
| download | bootstrap-a26b4bb78b6b9f3812aa64d3893cc166153426b4.tar.xz bootstrap-a26b4bb78b6b9f3812aa64d3893cc166153426b4.zip | |
Merge pull request #19011 from twbs/scss-lint
Bump SCSS-Lint, and `bundle update`
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 24 | ||||
| -rw-r--r-- | scss/_forms.scss | 3 |
3 files changed, 13 insertions, 16 deletions
@@ -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 index 720145482..7b6765989 100644 --- 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,12 +13,12 @@ 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) @@ -26,15 +26,15 @@ GEM 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 index 6de81fcf8..aa87bd51a 100644 --- 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 |