diff --git a/docs/javascript.html b/docs/javascript.html index 7280852ced..0f24cdd586 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -3,7 +3,6 @@ layout: default title: JavaScript slug: js lead: "Bring Bootstrap's components to life with over a dozen custom jQuery plugins. Easily include them all, or one by one." -base_url: "../" --- From 1e4540f11bf460bf8f0dd53409951ad0fe14a603 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 31 Dec 2013 10:51:39 -0800 Subject: [PATCH 4/7] @cvrebert's feedback --- Gruntfile.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 111f85e41b..0e707e0cde 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -200,19 +200,19 @@ module.exports = function (grunt) { src: ['fonts/*'], dest: 'dist/' }, - dist_css: { + docsDistCss: { expand: true, cwd: './dist/css', src: ['*.min.css', '*.css.map'], dest: 'docs/dist/css' }, - dist_js: { + docsDistJs: { expand: true, cwd: './dist/js', src: ['*.min.js'], dest: 'docs/dist/js' }, - dist_fonts: { + docsDistFonts: { expand: true, src: ['fonts/*'], dest: 'docs/dist/' @@ -326,10 +326,10 @@ module.exports = function (grunt) { grunt.registerTask('dist-css', ['less', 'csscomb', 'usebanner']); // Fonts distribution task. - grunt.registerTask('dist-docs', ['copy']); + grunt.registerTask('dist-docs', ['copy:docsDistCss'], ['copy:docsDistJs'], ['copy:docsDistFonts']); // Full distribution task. - grunt.registerTask('dist', ['clean', 'dist-css', 'dist-docs', 'dist-js']); + grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js']); // Default task. grunt.registerTask('default', ['test', 'dist', 'build-glyphicons-data', 'build-customizer']); From b43371cd0acd8d8a176e23d5b1784c2a31bc71d6 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 31 Dec 2013 11:38:32 -0800 Subject: [PATCH 5/7] @nschonni's feedback <3 --- Gruntfile.js | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 0e707e0cde..8e37123b96 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -200,22 +200,15 @@ module.exports = function (grunt) { src: ['fonts/*'], dest: 'dist/' }, - docsDistCss: { + docs: { expand: true, - cwd: './dist/css', - src: ['*.min.css', '*.css.map'], - dest: 'docs/dist/css' - }, - docsDistJs: { - expand: true, - cwd: './dist/js', - src: ['*.min.js'], - dest: 'docs/dist/js' - }, - docsDistFonts: { - expand: true, - src: ['fonts/*'], - dest: 'docs/dist/' + cwd: './dist', + src: [ + '{css,js}/*.min.*', + '{css}*.map', + 'fonts/*' + ], + dest: 'docs/dist' } }, @@ -326,7 +319,7 @@ module.exports = function (grunt) { grunt.registerTask('dist-css', ['less', 'csscomb', 'usebanner']); // Fonts distribution task. - grunt.registerTask('dist-docs', ['copy:docsDistCss'], ['copy:docsDistJs'], ['copy:docsDistFonts']); + grunt.registerTask('dist-docs', ['copy:docs']); // Full distribution task. grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js']); From 78e1af58d6b38ee542c110fdb971cbb229d2d518 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 31 Dec 2013 11:57:44 -0800 Subject: [PATCH 6/7] typo --- Gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index 8e37123b96..a7251eef95 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -205,7 +205,7 @@ module.exports = function (grunt) { cwd: './dist', src: [ '{css,js}/*.min.*', - '{css}*.map', + '{css}/*.map', 'fonts/*' ], dest: 'docs/dist' From ac3f48bb19a91f1bf23aa5838e11acd62f741b0f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 31 Dec 2013 13:16:28 -0800 Subject: [PATCH 7/7] Fixes #12046: move .csscomb.json and .csslintrc to less/ folder --- Gruntfile.js | 4 ++-- .csscomb.json => less/.csscomb.json | 0 .csslintrc => less/.csslintrc | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename .csscomb.json => less/.csscomb.json (100%) rename .csslintrc => less/.csslintrc (100%) diff --git a/Gruntfile.js b/Gruntfile.js index a7251eef95..5ba7ca8bd5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -65,7 +65,7 @@ module.exports = function (grunt) { csslint: { options: { - csslintrc: '.csslintrc' + csslintrc: 'less/.csslintrc' }, src: [ 'dist/css/bootstrap.css', @@ -185,7 +185,7 @@ module.exports = function (grunt) { csscomb: { sort: { options: { - sortOrder: '.csscomb.json' + config: 'less/.csscomb.json' }, files: { 'dist/css/<%= pkg.name %>.css': ['dist/css/<%= pkg.name %>.css'], diff --git a/.csscomb.json b/less/.csscomb.json similarity index 100% rename from .csscomb.json rename to less/.csscomb.json diff --git a/.csslintrc b/less/.csslintrc similarity index 100% rename from .csslintrc rename to less/.csslintrc