From 4fae5a6f4b6d8528a8013030850bad60e9e4fba8 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 25 Aug 2015 08:43:47 +0300 Subject: Fix `grunt validate-html` task. --- Gruntfile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index b2b66855b..6dcb2085b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,7 @@ /*! * Bootstrap's Gruntfile * http://getbootstrap.com - * Copyright 2013-2014 Twitter, Inc. + * Copyright 2013-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -336,6 +336,7 @@ module.exports = function (grunt) { jekyll: { options: { + bundleExec: true, config: '_config.yml' }, docs: {}, @@ -350,7 +351,6 @@ module.exports = function (grunt) { options: { ignore: [ 'Element “img” is missing required attribute “src”.', - 'Bad value “X-UA-Compatible” for attribute “http-equiv” on element “meta”.', 'Attribute “autocomplete” not allowed on element “input” at this point.', 'Attribute “autocomplete” not allowed on element “button” at this point.', 'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)', @@ -438,7 +438,7 @@ module.exports = function (grunt) { require('time-grunt')(grunt); // Docs HTML validation task - grunt.registerTask('validate-html', ['jekyll:docs']); + grunt.registerTask('validate-html', ['jekyll:docs', 'htmllint']); var runSubset = function (subset) { return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset; -- cgit v1.2.3 From 606393502db7d1dc9f0846a2902ff1964f1e7101 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 25 Aug 2015 15:37:19 +0300 Subject: Specify Internet Explorer 9 as the minimum supported version. --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 6dcb2085b..a444bd8d8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -260,7 +260,7 @@ module.exports = function (grunt) { options: { // TODO: disable `zeroUnits` optimization once clean-css 3.2 is released // and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly - compatibility: 'ie8', + compatibility: 'ie9', keepSpecialComments: '*', sourceMap: true, noAdvanced: true -- cgit v1.2.3 From 8bc2e217548c40769438158ab122e035b5a38eef Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Aug 2015 22:51:08 -0700 Subject: Gruntfile: rm reference to defunct customizer [skip sauce] --- Gruntfile.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index a444bd8d8..530867454 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -190,10 +190,6 @@ module.exports = function (grunt) { src: '<%= concat.bootstrap.dest %>', dest: 'dist/js/<%= pkg.name %>.min.js' }, - customize: { - src: configBridge.paths.customizerJs, - dest: 'docs/assets/js/customize.min.js' - }, docsJs: { src: configBridge.paths.docsJs, dest: 'docs/assets/js/docs.min.js' -- cgit v1.2.3 From 3cc25428be29cb65fcf384ea4a9516c152c1ad78 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Aug 2015 23:00:18 -0700 Subject: rm broken bundle update task & defunct custom RubyGem caching scheme [skip sauce] --- Gruntfile.js | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 530867454..7babb0b93 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -399,14 +399,6 @@ module.exports = function (grunt) { exec: { npmUpdate: { command: 'npm update' - }, - bundleUpdate: { - command: function () { - // Update dev gems and all the test gemsets - return 'bundle update && ' + glob.sync('test-infra/gemfiles/*.gemfile').map(function (gemfile) { - return 'BUNDLE_GEMFILE=' + gemfile + ' bundle update'; - }).join(' && '); - } } }, @@ -531,7 +523,4 @@ module.exports = function (grunt) { done(); }); }); - // Task for updating the cached RubyGem packages used by the Travis build (which are controlled by test-infra/Gemfile.lock). - // This task should be run and the updated file should be committed whenever Bootstrap's RubyGem dependencies change. - grunt.registerTask('update-gemfile-lock', ['exec:bundleUpdate']); }; -- cgit v1.2.3 From 6c8bf4ca88cfb004e3199f91c524e6350f5123ce Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Aug 2015 23:58:27 -0700 Subject: Add babel:dev to dist-js Grunt task so that `grunt test` doesn't use stale JS [skip sauce] --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 7babb0b93..f6348286d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -462,7 +462,7 @@ module.exports = function (grunt) { grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']); // JS distribution task. - grunt.registerTask('dist-js', ['concat', 'lineremover', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']); + grunt.registerTask('dist-js', ['babel:dev', 'concat', 'lineremover', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']); grunt.registerTask('test-scss', ['scsslint']); -- cgit v1.2.3 From 631f3eca4b67180de53bb06bbb27bb1e197f8d5e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 26 Aug 2015 00:55:24 -0700 Subject: Add babel:dev to Sauce Grunt subtasks so we don't test stale JS Refs #17328 --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index f6348286d..80437041f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -455,6 +455,7 @@ module.exports = function (grunt) { runSubset('sauce-js-unit') && // Skip Sauce on Travis when [skip sauce] is in the commit message isUndefOrNonZero(process.env.TWBS_DO_SAUCE)) { + testSubtasks.push('babel:dev'); testSubtasks.push('connect'); testSubtasks.push('saucelabs-qunit'); } -- cgit v1.2.3 From 750656fc9cb00b3ac399ed958955d0df6d901ffe Mon Sep 17 00:00:00 2001 From: Xavier Gallardo Date: Wed, 2 Sep 2015 15:07:20 -0400 Subject: Add a license header to bootstrap.scss --- Gruntfile.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 80437041f..0af3eacf0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -278,16 +278,6 @@ module.exports = function (grunt) { } }, - usebanner: { - options: { - position: 'top', - banner: '<%= banner %>' - }, - files: { - src: 'dist/css/*.css' - } - }, - csscomb: { options: { config: 'scss/.csscomb.json' @@ -475,7 +465,7 @@ module.exports = function (grunt) { // grunt.registerTask('sass-compile', ['sass:core', 'sass:extras', 'sass:docs']); grunt.registerTask('sass-compile', ['sass:core', 'sass:docs']); - grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'autoprefixer:core', 'usebanner', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']); + grunt.registerTask('dist-css', ['sass-compile', 'postcss:core', 'autoprefixer:core', 'csscomb:dist', 'cssmin:core', 'cssmin:docs']); // Full distribution task. grunt.registerTask('dist', ['clean:dist', 'dist-css', 'dist-js']); -- cgit v1.2.3 From a3d0a2c0452d81e5217b6dfead7eee9ff5884ada Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Aug 2015 18:15:47 +0300 Subject: Update htmllint rules for the new version. --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 0af3eacf0..b20922324 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -337,7 +337,7 @@ module.exports = function (grunt) { options: { ignore: [ 'Element “img” is missing required attribute “src”.', - 'Attribute “autocomplete” not allowed on element “input” at this point.', + 'Attribute “autocomplete” is only allowed when the input type is “color”, “date”, “datetime”, “datetime-local”, “email”, “month”, “number”, “password”, “range”, “search”, “tel”, “text”, “time”, “url”, or “week”.', 'Attribute “autocomplete” not allowed on element “button” at this point.', 'Element “div” not allowed as child of element “progress” in this context. (Suppressing further errors from this subtree.)', 'Consider using the “h1” element as a top-level heading only (all “h1” elements are treated as top-level headings by many screen readers and other tools).', -- cgit v1.2.3 From f14113133d8108e544996dbfe19e470ddf991919 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sun, 6 Sep 2015 12:16:01 +0300 Subject: Remove `gem install scss_lint` from Travis. Instead, use `bundleExec: true` for grunt-scss-lint. --- Gruntfile.js | 1 + 1 file changed, 1 insertion(+) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index b20922324..e4d0e43e7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -206,6 +206,7 @@ module.exports = function (grunt) { // CSS build configuration scsslint: { options: { + bundleExec: true, config: 'scss/.scsslint.yml', reporterOutput: null }, -- cgit v1.2.3