diff --git a/Gruntfile.js b/Gruntfile.js index 3007bb1e12..e05763f1c5 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -97,6 +97,14 @@ module.exports = function(grunt) { } }, + copy: { + fonts: { + expand: true, + src: ["fonts/*"], + dest: 'dist/' + } + }, + qunit: { options: { inject: 'js/tests/unit/phantom.js' @@ -147,6 +155,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-connect'); + grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-uglify'); @@ -157,10 +166,10 @@ module.exports = function(grunt) { grunt.loadNpmTasks('browserstack-runner'); // Docs HTML validation task - grunt.registerTask('validate-docs', ['jekyll', 'validation']); + grunt.registerTask('validate-html', ['jekyll', 'validation']); // Test task. - var testSubtasks = ['jshint', 'qunit', 'validate-docs']; + var testSubtasks = ['dist-css', 'jshint', 'qunit', 'validate-html']; // Only run BrowserStack tests under Travis if (process.env.TRAVIS) { // Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key @@ -176,8 +185,11 @@ module.exports = function(grunt) { // CSS distribution task. grunt.registerTask('dist-css', ['recess']); + // Fonts distribution task. + grunt.registerTask('dist-fonts', ['copy']); + // Full distribution task. - grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']); + grunt.registerTask('dist', ['clean', 'dist-css', 'dist-fonts', 'dist-js']); // Default task. grunt.registerTask('default', ['test', 'dist', 'build-customizer']); diff --git a/_config.yml b/_config.yml index 6f68eb7521..332f252fd7 100644 --- a/_config.yml +++ b/_config.yml @@ -15,9 +15,6 @@ repo: https://github.com/twbs/bootstrap download: https://github.com/twbs/bootstrap/archive/v3.0.0.zip download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip -glyphicons: http://glyphicons.getbootstrap.com -glyphicons_repo: https://github.com/twbs/bootstrap-glyphicons - blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com diff --git a/_includes/footer.html b/_includes/footer.html index bd5a23b2c5..ef339687c7 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -13,6 +13,7 @@ + {% endif %} diff --git a/_includes/nav-components.html b/_includes/nav-components.html index c5ced697d1..a1105cddae 100644 --- a/_includes/nav-components.html +++ b/_includes/nav-components.html @@ -1,3 +1,11 @@ +
  • + Glyphicons + +
  • Dropdowns
  • -
  • - Glyphicons -
  • Grid system