From 381a55ed1a5675ce1728de890759d61370315ab9 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 4 Apr 2015 12:05:00 +0300 Subject: Update dependencies. --- Gruntfile.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index b715189a9..7ae57b425 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -126,7 +126,11 @@ module.exports = function (grunt) { uglify: { options: { - preserveComments: 'some' + compress: { + warnings: false + }, + mangle: true, + preserveComments: 'some', }, core: { src: '<%= concat.bootstrap.dest %>', -- cgit v1.2.3 From a204780b8ba8d53da3a0cd2dac9e4dddc0e3da26 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 8 Apr 2015 09:27:13 +0300 Subject: Remove extra comma. --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 7ae57b425..293d455a2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -130,7 +130,7 @@ module.exports = function (grunt) { warnings: false }, mangle: true, - preserveComments: 'some', + preserveComments: 'some' }, core: { src: '<%= concat.bootstrap.dest %>', -- cgit v1.2.3 From e778dc1348beaa0b5e452da3076bcf5e335b8917 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 14 Nov 2014 15:00:02 +0200 Subject: Add grunt-contrib-htmlmin. Only used for the GitHub docs. --- Gruntfile.js | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 293d455a2..28cd22481 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -321,6 +321,26 @@ module.exports = function (grunt) { } }, + htmlmin: { + dist: { + options: { + collapseWhitespace: true, + conservativeCollapse: true, + minifyCSS: true, + minifyJS: true, + removeAttributeQuotes: true, + removeComments: true + }, + expand: true, + cwd: '_gh_pages', + dest: '_gh_pages', + src: [ + '**/*.html', + '!examples/**/*.html' + ] + } + }, + jade: { options: { pretty: true, @@ -495,7 +515,7 @@ module.exports = function (grunt) { grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']); grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']); - grunt.registerTask('prep-release', ['jekyll:github', 'compress']); + grunt.registerTask('prep-release', ['jekyll:github', 'htmlmin', 'compress']); // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json). // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change. -- cgit v1.2.3 From f3386079f34334c20bb09eaf17cd8a66d17cfbf7 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 23 Apr 2015 13:17:45 +0300 Subject: Grunt: extend `prep-release` task. Make it so that everything is done for us to reduce the possibility of missing something when releasing. --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 28cd22481..1bffd7c34 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -515,7 +515,7 @@ module.exports = function (grunt) { grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']); grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']); - grunt.registerTask('prep-release', ['jekyll:github', 'htmlmin', 'compress']); + grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']); // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json). // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change. -- cgit v1.2.3 From 4f85fcfc28aee49884dbab86cdd435bc96ef06d0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 23 Apr 2015 12:00:58 -0700 Subject: Fix #16075 by switching to maintained fork of grunt-sed [skip sauce] [skip validator] --- Gruntfile.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 1bffd7c34..ce218828e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -389,6 +389,14 @@ module.exports = function (grunt) { return old ? RegExp.quote(old) : old; })(), replacement: grunt.option('newver'), + exclude: [ + 'dist/fonts', + 'docs/assets', + 'fonts', + 'js/tests/vendor', + 'node_modules', + 'test-infra' + ], recursive: true } }, -- cgit v1.2.3 From fae8c5d0dc1814ef01c607d3a6551eb286e62f0d Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 28 Apr 2015 10:15:32 +0300 Subject: Add package.js in Grunt tasks. --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index ce218828e..f6cae30e3 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -63,7 +63,7 @@ module.exports = function (grunt) { options: { jshintrc: 'grunt/.jshintrc' }, - src: ['Gruntfile.js', 'grunt/*.js'] + src: ['Gruntfile.js', 'package.js', 'grunt/*.js'] }, core: { src: 'js/*.js' -- cgit v1.2.3 From dec2faec3d1ebdf0f72d5814e570ebc453346cde Mon Sep 17 00:00:00 2001 From: Bryan Braun Date: Fri, 15 May 2015 00:37:07 -0400 Subject: Update Anchor.js and port over the existing styles. Anchor.js 1.0.0 drops the need to use anchor.css, so we remove it from the codebase and move any leftover styles over to docs.css. Closes #16488 by merging it. --- Gruntfile.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index f6cae30e3..32cc83fdf 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -195,7 +195,7 @@ module.exports = function (grunt) { src: 'dist/css/<%= pkg.name %>-theme.css' }, docs: { - src: ['docs/assets/css/anchor.css', 'docs/assets/css/src/docs.css'] + src: ['docs/assets/css/src/docs.css'] }, examples: { expand: true, @@ -244,9 +244,7 @@ module.exports = function (grunt) { docs: { src: [ 'docs/assets/css/src/pygments-manni.css', - 'docs/assets/css/src/anchor.css', 'docs/assets/css/src/docs.css' - ], dest: 'docs/assets/css/docs.min.css' } -- cgit v1.2.3 From c56032a0e5810acbc002b45b5b900dacafa32483 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 16 May 2015 10:47:19 +0300 Subject: Remove grunt-banner completely. Add a license header in theme instead. --- Gruntfile.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 32cc83fdf..5bd74604e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -250,16 +250,6 @@ module.exports = function (grunt) { } }, - usebanner: { - options: { - position: 'top', - banner: '<%= banner %>' - }, - files: { - src: 'dist/css/*.css' - } - }, - csscomb: { options: { config: 'less/.csscomb.json' @@ -485,7 +475,7 @@ module.exports = function (grunt) { // CSS distribution task. grunt.registerTask('less-compile', ['less:compileCore', 'less:compileTheme']); - grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'usebanner', 'csscomb:dist', 'cssmin:minifyCore', 'cssmin:minifyTheme']); + grunt.registerTask('dist-css', ['less-compile', 'autoprefixer:core', 'autoprefixer:theme', 'csscomb:dist', 'cssmin:minifyCore', 'cssmin:minifyTheme']); // Full distribution task. grunt.registerTask('dist', ['clean:dist', 'dist-css', 'copy:fonts', 'dist-js']); -- cgit v1.2.3 From cbe0f352d136c8a0750b0ff0294038818ad91a50 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 1 Jun 2015 09:58:35 +0300 Subject: Fix license header after e93c6a2216c69daa574abc16e7c14767fce44ad6. [ci skip] --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 5bd74604e..4c021cef1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -44,7 +44,7 @@ module.exports = function (grunt) { banner: '/*!\n' + ' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' + ' * Copyright 2011-<%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + - ' * Licensed under <%= pkg.license.type %> (<%= pkg.license.url %>)\n' + + ' * Licensed under the <%= pkg.license %> license\n' + ' */\n', jqueryCheck: configBridge.config.jqueryCheck.join('\n'), jqueryVersionCheck: configBridge.config.jqueryVersionCheck.join('\n'), -- cgit v1.2.3 From 3df2d085ed219a16848b96e90a72fcd5575a5270 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 19 Jun 2015 00:14:52 -0700 Subject: fix scsslint.yml path --- Gruntfile.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Gruntfile.js') diff --git a/Gruntfile.js b/Gruntfile.js index 70c52fe5e..a387e3ca2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -205,11 +205,11 @@ module.exports = function (grunt) { // CSS build configuration scsslint: { - scss: ['scss/*.scss', '!scss/_normalize.scss'], options: { - config: 'scss/.scss-lint.yml', - reporterOutput: 'scss-lint-report.xml' - } + config: 'scss/.scsslint.yml', + reporterOutput: null + }, + src: ['scss/*.scss', '!scss/_normalize.scss'] }, postcss: { -- cgit v1.2.3