diff options
| author | Mark Otto <[email protected]> | 2013-12-06 11:27:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-06 11:27:19 -0800 |
| commit | dc34c8a206cbbe7a7fbac9d56fc1683c394a5b3b (patch) | |
| tree | e5d0df5cf5a23993fc88ffcb6aade1f93ef98869 | |
| parent | e90e602b53070d6a023d2f5769413c66883e47fa (diff) | |
| parent | 3de4f23ea210dd964748528503444bbaeed860ce (diff) | |
| download | bootstrap-dc34c8a206cbbe7a7fbac9d56fc1683c394a5b3b.tar.xz bootstrap-dc34c8a206cbbe7a7fbac9d56fc1683c394a5b3b.zip | |
Merge pull request #11738 from XhmikosR/min-assets
Minify docs-assets too.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Gruntfile.js | 10 | ||||
| -rw-r--r-- | _includes/footer.html | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 465cdb463..60bfe60fe 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ validation-report.json # Folders to ignore node_modules bower_components +/docs-assets/js/customize.js diff --git a/Gruntfile.js b/Gruntfile.js index 77477596d..c60e600ab 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -72,6 +72,16 @@ module.exports = function(grunt) { bootstrap: { src: ['<%= concat.bootstrap.dest %>'], dest: 'dist/js/<%= pkg.name %>.min.js' + }, + customize: { + src: [ + 'docs-assets/js/less.js', + 'docs-assets/js/jszip.js', + 'docs-assets/js/uglify.js', + 'docs-assets/js/filesaver.js', + 'docs-assets/js/customizer.js' + ], + dest: 'docs-assets/js/customize.js' } }, diff --git a/_includes/footer.html b/_includes/footer.html index 56518ac49..1188e10cf 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -9,12 +9,8 @@ <script src="{{ page.base_url }}docs-assets/js/application.js"></script> {% if page.slug == "customize" %} -<script src="{{ page.base_url }}docs-assets/js/less.js"></script> -<script src="{{ page.base_url }}docs-assets/js/jszip.js"></script> -<script src="{{ page.base_url }}docs-assets/js/uglify.js"></script> -<script src="{{ page.base_url }}docs-assets/js/filesaver.js"></script> <script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script> -<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script> +<script src="{{ page.base_url }}docs-assets/js/customize.js"></script> {% endif %} {% comment %} |