diff --git a/Gruntfile.js b/Gruntfile.js index dd6fb5f0e..e05763f1c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -166,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 diff --git a/_layouts/home.html b/_layouts/home.html index 843994ca6..e68ee68df 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -25,7 +25,7 @@ GitHub project
  • - Examples + Examples
  • Glyphicons diff --git a/assets/ico/apple-touch-icon-114-precomposed.png b/assets/ico/apple-touch-icon-114-precomposed.png index 9d08f7d1f..d8597a12b 100644 Binary files a/assets/ico/apple-touch-icon-114-precomposed.png and b/assets/ico/apple-touch-icon-114-precomposed.png differ diff --git a/assets/ico/apple-touch-icon-144-precomposed.png b/assets/ico/apple-touch-icon-144-precomposed.png index 1d2cb98f3..fd8e13dea 100644 Binary files a/assets/ico/apple-touch-icon-144-precomposed.png and b/assets/ico/apple-touch-icon-144-precomposed.png differ diff --git a/assets/ico/apple-touch-icon-57-precomposed.png b/assets/ico/apple-touch-icon-57-precomposed.png index 292e73849..8e139fdf0 100644 Binary files a/assets/ico/apple-touch-icon-57-precomposed.png and b/assets/ico/apple-touch-icon-57-precomposed.png differ diff --git a/assets/ico/apple-touch-icon-72-precomposed.png b/assets/ico/apple-touch-icon-72-precomposed.png index 6ef2d552a..e262c24af 100644 Binary files a/assets/ico/apple-touch-icon-72-precomposed.png and b/assets/ico/apple-touch-icon-72-precomposed.png differ diff --git a/assets/ico/favicon.png b/assets/ico/favicon.png index a5ddaba17..56aa877f2 100644 Binary files a/assets/ico/favicon.png and b/assets/ico/favicon.png differ diff --git a/components.html b/components.html index 6b3ca7053..7475fa108 100644 --- a/components.html +++ b/components.html @@ -56,191 +56,206 @@ base_url: "../"

    Available glyphs

    Includes 180 glyphs in font format from the Glyphicon Halflings set. Glyphicons Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to Glyphicons whenever possible.

    @@ -256,17 +271,17 @@ base_url: "../"
    - + + +
    - + + +
    {% highlight html %} @@ -1312,7 +1327,7 @@ base_url: "../"

    Tabs with dropdowns

    -
    -
    {% highlight html %} -