rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

Merge pull request #19011 from twbs/scss-lint

Browse Source 
Bump SCSS-Lint, and `bundle update`
This commit is contained in:
Chris Rebert 2016-01-23 03:11:13 -08:00
commit a26b4bb78b
3 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -8,5 +8,5 @@ group :development, :test do
gem 'jekyll-redirect-from', '~> 0.9.0' gem 'jekyll-redirect-from', '~> 0.9.0'
gem 'jekyll-sitemap', '~> 0.9.0' gem 'jekyll-sitemap', '~> 0.9.0'
gem 'sass', '~> 3.4.19' gem 'sass', '~> 3.4.19'
gem 'scss_lint', '~> 0.43' gem 'scss_lint', '~> 0.44.0'
end end

24
Gemfile.lock
View File

@ -4,7 +4,7 @@ GEM
colorator (0.1) colorator (0.1)
ffi (1.9.10) ffi (1.9.10)
ffi (1.9.10-x64-mingw32) ffi (1.9.10-x64-mingw32)
jekyll (3.0.1) jekyll (3.0.2)
colorator (~> 0.1) colorator (~> 0.1)
jekyll-sass-converter (~> 1.0) jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1) jekyll-watch (~> 1.1)
@ -13,12 +13,12 @@ GEM
mercenary (~> 0.3.3) mercenary (~> 0.3.3)
rouge (~> 1.7) rouge (~> 1.7)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
jekyll-redirect-from (0.9.0) jekyll-redirect-from (0.9.1)
jekyll (>= 2.0) jekyll (>= 2.0)
jekyll-sass-converter (1.3.0) jekyll-sass-converter (1.4.0)
sass (~> 3.2) sass (~> 3.4)
jekyll-sitemap (0.9.0) jekyll-sitemap (0.9.0)
jekyll-watch (1.3.0) jekyll-watch (1.3.1)
listen (~> 3.0) listen (~> 3.0)
kramdown (1.9.0) kramdown (1.9.0)
liquid (3.0.6) liquid (3.0.6)
@ -26,15 +26,15 @@ GEM
rb-fsevent (>= 0.9.3) rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9) rb-inotify (>= 0.9)
mercenary (0.3.5) mercenary (0.3.5)
rainbow (2.0.0) rake (10.5.0)
rb-fsevent (0.9.6) rb-fsevent (0.9.7)
rb-inotify (0.9.5) rb-inotify (0.9.5)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rouge (1.10.1) rouge (1.10.1)
safe_yaml (1.0.4) safe_yaml (1.0.4)
sass (3.4.19) sass (3.4.21)
scss_lint (0.43.2) scss_lint (0.44.0)
rainbow (~> 2.0) rake (~> 10.0)
sass (~> 3.4.15) sass (~> 3.4.15)
PLATFORMS PLATFORMS
@ -46,7 +46,7 @@ DEPENDENCIES
jekyll-redirect-from (~> 0.9.0) jekyll-redirect-from (~> 0.9.0)
jekyll-sitemap (~> 0.9.0) jekyll-sitemap (~> 0.9.0)
sass (~> 3.4.19) sass (~> 3.4.19)
scss_lint (~> 0.43) scss_lint (~> 0.44.0)
BUNDLED WITH BUNDLED WITH
1.10.6 1.11.2

3
scss/_forms.scss
View File

@ -92,8 +92,6 @@
// //
// Note that as of 8.3, iOS doesn't support `week`. // 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/ _::-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="date"],
input[type="time"], input[type="time"],
@ -113,7 +111,6 @@ input[type="month"] {
line-height: $input-height-lg; line-height: $input-height-lg;
} }
} }
// scss-lint:enable PseudoElement
// Static form control text // Static form control text