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
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.
-
.glyphicon .glyphicon-glass
-
.glyphicon .glyphicon-music
-
.glyphicon .glyphicon-search
-
.glyphicon .glyphicon-envelope
-
.glyphicon .glyphicon-heart
-
.glyphicon .glyphicon-star
-
.glyphicon .glyphicon-star-empty
-
.glyphicon .glyphicon-user
-
.glyphicon .glyphicon-film
-
.glyphicon .glyphicon-th-large
-
.glyphicon .glyphicon-th
-
.glyphicon .glyphicon-th-list
-
.glyphicon .glyphicon-ok
-
.glyphicon .glyphicon-remove
-
.glyphicon .glyphicon-zoom-in
-
.glyphicon .glyphicon-zoom-out
-
.glyphicon .glyphicon-off
-
.glyphicon .glyphicon-signal
-
.glyphicon .glyphicon-cog
-
.glyphicon .glyphicon-trash
-
.glyphicon .glyphicon-home
-
.glyphicon .glyphicon-file
-
.glyphicon .glyphicon-time
-
.glyphicon .glyphicon-road
-
.glyphicon .glyphicon-download-alt
-
.glyphicon .glyphicon-download
-
.glyphicon .glyphicon-upload
-
.glyphicon .glyphicon-inbox
-
-
.glyphicon .glyphicon-play-circle
-
.glyphicon .glyphicon-repeat
-
.glyphicon .glyphicon-refresh
-
.glyphicon .glyphicon-list-alt
-
.glyphicon .glyphicon-lock
-
.glyphicon .glyphicon-flag
-
.glyphicon .glyphicon-headphones
-
.glyphicon .glyphicon-volume-off
-
.glyphicon .glyphicon-volume-down
-
.glyphicon .glyphicon-volume-up
-
.glyphicon .glyphicon-qrcode
-
.glyphicon .glyphicon-barcode
-
.glyphicon .glyphicon-tag
-
.glyphicon .glyphicon-tags
-
.glyphicon .glyphicon-book
-
.glyphicon .glyphicon-bookmark
-
.glyphicon .glyphicon-print
-
.glyphicon .glyphicon-camera
-
.glyphicon .glyphicon-font
-
.glyphicon .glyphicon-bold
-
.glyphicon .glyphicon-italic
-
.glyphicon .glyphicon-text-height
-
.glyphicon .glyphicon-text-width
-
.glyphicon .glyphicon-align-left
-
.glyphicon .glyphicon-align-center
-
.glyphicon .glyphicon-align-right
-
.glyphicon .glyphicon-align-justify
-
.glyphicon .glyphicon-list
-
-
.glyphicon .glyphicon-indent-left
-
.glyphicon .glyphicon-indent-right
-
.glyphicon .glyphicon-facetime-video
-
.glyphicon .glyphicon-picture
-
.glyphicon .glyphicon-pencil
-
.glyphicon .glyphicon-map-marker
.glyphicon .glyphicon-adjust
-
.glyphicon .glyphicon-tint
-
.glyphicon .glyphicon-edit
-
.glyphicon .glyphicon-share
-
.glyphicon .glyphicon-check
-
.glyphicon .glyphicon-move
-
.glyphicon .glyphicon-step-backward
-
.glyphicon .glyphicon-fast-backward
-
.glyphicon .glyphicon-backward
-
.glyphicon .glyphicon-play
-
.glyphicon .glyphicon-pause
-
.glyphicon .glyphicon-stop
-
.glyphicon .glyphicon-forward
-
.glyphicon .glyphicon-fast-forward
-
.glyphicon .glyphicon-step-forward
-
.glyphicon .glyphicon-eject
-
.glyphicon .glyphicon-chevron-left
-
.glyphicon .glyphicon-chevron-right
-
.glyphicon .glyphicon-plus-sign
-
.glyphicon .glyphicon-minus-sign
-
.glyphicon .glyphicon-remove-sign
-
.glyphicon .glyphicon-ok-sign
-
-
.glyphicon .glyphicon-question-sign
-
.glyphicon .glyphicon-info-sign
-
.glyphicon .glyphicon-screenshot
-
.glyphicon .glyphicon-remove-circle
-
.glyphicon .glyphicon-ok-circle
-
.glyphicon .glyphicon-ban-circle
+
.glyphicon .glyphicon-align-center
+
.glyphicon .glyphicon-align-justify
+
.glyphicon .glyphicon-align-left
+
.glyphicon .glyphicon-align-right
+
.glyphicon .glyphicon-arrow-down
.glyphicon .glyphicon-arrow-left
.glyphicon .glyphicon-arrow-right
.glyphicon .glyphicon-arrow-up
-
.glyphicon .glyphicon-arrow-down
-
.glyphicon .glyphicon-share-alt
-
.glyphicon .glyphicon-resize-full
-
.glyphicon .glyphicon-resize-small
-
.glyphicon .glyphicon-plus
-
.glyphicon .glyphicon-minus
.glyphicon .glyphicon-asterisk
-
.glyphicon .glyphicon-exclamation-sign
-
.glyphicon .glyphicon-gift
-
.glyphicon .glyphicon-leaf
-
.glyphicon .glyphicon-fire
-
.glyphicon .glyphicon-eye-open
-
.glyphicon .glyphicon-eye-close
-
.glyphicon .glyphicon-warning-sign
-
.glyphicon .glyphicon-plane
-
.glyphicon .glyphicon-calendar
-
.glyphicon .glyphicon-random
-
.glyphicon .glyphicon-comment
-
.glyphicon .glyphicon-magnet
-
-
.glyphicon .glyphicon-chevron-up
-
.glyphicon .glyphicon-chevron-down
-
.glyphicon .glyphicon-retweet
-
.glyphicon .glyphicon-shopping-cart
-
.glyphicon .glyphicon-folder-close
-
.glyphicon .glyphicon-folder-open
-
.glyphicon .glyphicon-resize-vertical
-
.glyphicon .glyphicon-resize-horizontal
-
.glyphicon .glyphicon-hdd
-
.glyphicon .glyphicon-bullhorn
+
.glyphicon .glyphicon-backward
+
.glyphicon .glyphicon-ban-circle
+
.glyphicon .glyphicon-barcode
.glyphicon .glyphicon-bell
-
.glyphicon .glyphicon-certificate
-
.glyphicon .glyphicon-thumbs-up
-
.glyphicon .glyphicon-thumbs-down
-
.glyphicon .glyphicon-hand-right
-
.glyphicon .glyphicon-hand-left
-
.glyphicon .glyphicon-hand-up
-
.glyphicon .glyphicon-hand-down
-
.glyphicon .glyphicon-circle-arrow-right
-
.glyphicon .glyphicon-circle-arrow-left
-
.glyphicon .glyphicon-circle-arrow-up
-
.glyphicon .glyphicon-circle-arrow-down
-
.glyphicon .glyphicon-globe
-
.glyphicon .glyphicon-wrench
-
.glyphicon .glyphicon-tasks
-
.glyphicon .glyphicon-filter
+
.glyphicon .glyphicon-bold
+
.glyphicon .glyphicon-book
+
.glyphicon .glyphicon-bookmark
.glyphicon .glyphicon-briefcase
-
.glyphicon .glyphicon-fullscreen
-
-
.glyphicon .glyphicon-log-in
-
.glyphicon .glyphicon-flash
-
.glyphicon .glyphicon-log-out
-
.glyphicon .glyphicon-new-window
-
.glyphicon .glyphicon-record
-
.glyphicon .glyphicon-save
-
.glyphicon .glyphicon-open
-
.glyphicon .glyphicon-saved
-
.glyphicon .glyphicon-import
-
.glyphicon .glyphicon-export
-
.glyphicon .glyphicon-send
-
.glyphicon .glyphicon-floppy-disk
-
.glyphicon .glyphicon-floppy-saved
-
.glyphicon .glyphicon-floppy-remove
-
.glyphicon .glyphicon-floppy-save
-
.glyphicon .glyphicon-floppy-open
-
.glyphicon .glyphicon-credit-card
-
.glyphicon .glyphicon-transfer
-
.glyphicon .glyphicon-cutlery
-
.glyphicon .glyphicon-header
-
.glyphicon .glyphicon-compressed
-
.glyphicon .glyphicon-earphone
-
.glyphicon .glyphicon-phone-alt
-
.glyphicon .glyphicon-tower
-
.glyphicon .glyphicon-stats
-
.glyphicon .glyphicon-sd-video
-
.glyphicon .glyphicon-hd-video
-
.glyphicon .glyphicon-subtitles
-
.glyphicon .glyphicon-sound-stereo
-
.glyphicon .glyphicon-sound-dolby
-
.glyphicon .glyphicon-sound-5-1
-
.glyphicon .glyphicon-sound-6-1
-
.glyphicon .glyphicon-sound-7-1
-
.glyphicon .glyphicon-copyright-mark
-
.glyphicon .glyphicon-registration-mark
+
.glyphicon .glyphicon-bullhorn
+
.glyphicon .glyphicon-calendar
+
.glyphicon .glyphicon-camera
+
.glyphicon .glyphicon-certificate
+
.glyphicon .glyphicon-check
+
.glyphicon .glyphicon-chevron-down
+
.glyphicon .glyphicon-chevron-left
+
.glyphicon .glyphicon-chevron-right
+
.glyphicon .glyphicon-chevron-up
+
.glyphicon .glyphicon-circle-arrow-down
+
.glyphicon .glyphicon-circle-arrow-left
+
.glyphicon .glyphicon-circle-arrow-right
+
.glyphicon .glyphicon-circle-arrow-up
.glyphicon .glyphicon-cloud
.glyphicon .glyphicon-cloud-download
.glyphicon .glyphicon-cloud-upload
+
.glyphicon .glyphicon-cog
+
.glyphicon .glyphicon-collapse-down
+
.glyphicon .glyphicon-collapse-up
+
.glyphicon .glyphicon-comment
+
.glyphicon .glyphicon-compressed
+
.glyphicon .glyphicon-copyright-mark
+
.glyphicon .glyphicon-credit-card
+
.glyphicon .glyphicon-cutlery
+
.glyphicon .glyphicon-dashboard
+
.glyphicon .glyphicon-download
+
.glyphicon .glyphicon-download-alt
+
.glyphicon .glyphicon-earphone
+
.glyphicon .glyphicon-edit
+
.glyphicon .glyphicon-eject
+
.glyphicon .glyphicon-envelope
+
.glyphicon .glyphicon-euro
+
.glyphicon .glyphicon-exclamation-sign
+
.glyphicon .glyphicon-expand
+
.glyphicon .glyphicon-export
+
.glyphicon .glyphicon-eye-close
+
.glyphicon .glyphicon-eye-open
+
.glyphicon .glyphicon-facetime-video
+
.glyphicon .glyphicon-fast-backward
+
.glyphicon .glyphicon-fast-forward
+
.glyphicon .glyphicon-file
+
.glyphicon .glyphicon-film
+
.glyphicon .glyphicon-filter
+
.glyphicon .glyphicon-fire
+
.glyphicon .glyphicon-flag
+
.glyphicon .glyphicon-flash
+
.glyphicon .glyphicon-floppy-disk
+
.glyphicon .glyphicon-floppy-open
+
.glyphicon .glyphicon-floppy-remove
+
.glyphicon .glyphicon-floppy-save
+
.glyphicon .glyphicon-floppy-saved
+
.glyphicon .glyphicon-folder-close
+
.glyphicon .glyphicon-folder-open
+
.glyphicon .glyphicon-font
+
.glyphicon .glyphicon-forward
+
.glyphicon .glyphicon-fullscreen
+
.glyphicon .glyphicon-gbp
+
.glyphicon .glyphicon-gift
+
.glyphicon .glyphicon-glass
+
.glyphicon .glyphicon-globe
+
.glyphicon .glyphicon-hand-down
+
.glyphicon .glyphicon-hand-left
+
.glyphicon .glyphicon-hand-right
+
.glyphicon .glyphicon-hand-up
+
.glyphicon .glyphicon-hd-video
+
.glyphicon .glyphicon-hdd
+
.glyphicon .glyphicon-header
+
.glyphicon .glyphicon-headphones
+
.glyphicon .glyphicon-heart
+
.glyphicon .glyphicon-heart-empty
+
.glyphicon .glyphicon-home
+
.glyphicon .glyphicon-import
+
.glyphicon .glyphicon-inbox
+
.glyphicon .glyphicon-indent-left
+
.glyphicon .glyphicon-indent-right
+
.glyphicon .glyphicon-info-sign
+
.glyphicon .glyphicon-italic
+
.glyphicon .glyphicon-leaf
+
.glyphicon .glyphicon-link
+
.glyphicon .glyphicon-list
+
.glyphicon .glyphicon-list-alt
+
.glyphicon .glyphicon-lock
+
.glyphicon .glyphicon-log-in
+
.glyphicon .glyphicon-log-out
+
.glyphicon .glyphicon-magnet
+
.glyphicon .glyphicon-map-marker
+
.glyphicon .glyphicon-minus
+
.glyphicon .glyphicon-minus-sign
+
.glyphicon .glyphicon-move
+
.glyphicon .glyphicon-music
+
.glyphicon .glyphicon-new-window
+
.glyphicon .glyphicon-off
+
.glyphicon .glyphicon-ok
+
.glyphicon .glyphicon-ok-circle
+
.glyphicon .glyphicon-ok-sign
+
.glyphicon .glyphicon-open
+
.glyphicon .glyphicon-paperclip
+
.glyphicon .glyphicon-pause
+
.glyphicon .glyphicon-pencil
+
.glyphicon .glyphicon-phone
+
.glyphicon .glyphicon-phone-alt
+
.glyphicon .glyphicon-picture
+
.glyphicon .glyphicon-plane
+
.glyphicon .glyphicon-play
+
.glyphicon .glyphicon-play-circle
+
.glyphicon .glyphicon-plus
+
.glyphicon .glyphicon-plus-sign
+
.glyphicon .glyphicon-print
+
.glyphicon .glyphicon-pushpin
+
.glyphicon .glyphicon-qrcode
+
.glyphicon .glyphicon-question-sign
+
.glyphicon .glyphicon-random
+
.glyphicon .glyphicon-record
+
.glyphicon .glyphicon-refresh
+
.glyphicon .glyphicon-registration-mark
+
.glyphicon .glyphicon-remove
+
.glyphicon .glyphicon-remove-circle
+
.glyphicon .glyphicon-remove-sign
+
.glyphicon .glyphicon-repeat
+
.glyphicon .glyphicon-resize-full
+
.glyphicon .glyphicon-resize-horizontal
+
.glyphicon .glyphicon-resize-small
+
.glyphicon .glyphicon-resize-vertical
+
.glyphicon .glyphicon-retweet
+
.glyphicon .glyphicon-road
+
.glyphicon .glyphicon-save
+
.glyphicon .glyphicon-saved
+
.glyphicon .glyphicon-screenshot
+
.glyphicon .glyphicon-sd-video
+
.glyphicon .glyphicon-search
+
.glyphicon .glyphicon-send
+
.glyphicon .glyphicon-share
+
.glyphicon .glyphicon-share-alt
+
.glyphicon .glyphicon-shopping-cart
+
.glyphicon .glyphicon-signal
+
.glyphicon .glyphicon-sort
+
.glyphicon .glyphicon-sort-by-alphabet
+
.glyphicon .glyphicon-sort-by-alphabet-alt
+
.glyphicon .glyphicon-sort-by-attributes
+
.glyphicon .glyphicon-sort-by-attributes-alt
+
.glyphicon .glyphicon-sort-by-order
+
.glyphicon .glyphicon-sort-by-order-alt
+
.glyphicon .glyphicon-sound-5-1
+
.glyphicon .glyphicon-sound-6-1
+
.glyphicon .glyphicon-sound-7-1
+
.glyphicon .glyphicon-sound-dolby
+
.glyphicon .glyphicon-sound-stereo
+
.glyphicon .glyphicon-star
+
.glyphicon .glyphicon-star-empty
+
.glyphicon .glyphicon-stats
+
.glyphicon .glyphicon-step-backward
+
.glyphicon .glyphicon-step-forward
+
.glyphicon .glyphicon-stop
+
.glyphicon .glyphicon-subtitles
+
.glyphicon .glyphicon-tag
+
.glyphicon .glyphicon-tags
+
.glyphicon .glyphicon-tasks
+
.glyphicon .glyphicon-text-height
+
.glyphicon .glyphicon-text-width
+
.glyphicon .glyphicon-th
+
.glyphicon .glyphicon-th-large
+
.glyphicon .glyphicon-th-list
+
.glyphicon .glyphicon-thumbs-down
+
.glyphicon .glyphicon-thumbs-up
+
.glyphicon .glyphicon-time
+
.glyphicon .glyphicon-tint
+
.glyphicon .glyphicon-tower
+
.glyphicon .glyphicon-transfer
+
.glyphicon .glyphicon-trash
.glyphicon .glyphicon-tree-conifer
.glyphicon .glyphicon-tree-deciduous
+
.glyphicon .glyphicon-unchecked
+
.glyphicon .glyphicon-upload
+
.glyphicon .glyphicon-usd
+
.glyphicon .glyphicon-user
+
.glyphicon .glyphicon-volume-down
+
.glyphicon .glyphicon-volume-off
+
.glyphicon .glyphicon-volume-up
+
.glyphicon .glyphicon-warning-sign
+
.glyphicon .glyphicon-wrench
+
.glyphicon .glyphicon-zoom-in
+
.glyphicon .glyphicon-zoom-out
@@ -256,17 +271,17 @@ base_url: "../"
-
- Star
- Star
- Star
- Star
+ Star
+ Star
+ Star
+ Star
{% highlight html %}
@@ -1312,7 +1327,7 @@ base_url: "../"
Tabs with dropdowns
-
-
+
@@ -1450,7 +1465,7 @@ base_url: "../"
{% highlight html %}
-
+
@@ -1514,7 +1529,7 @@ base_url: "../"
Buttons
For buttons not residing in a <form>, add this class to vertically center buttons within a navbar.
For folks using standard links that are not within the regular navbar navigation component, use the .navbar-link class to add the proper colors for the default and inverse navbar options.
{% highlight html %}
-
+
...
{% endhighlight %}
@@ -1629,7 +1644,7 @@ body { padding-top: 70px; }
Fixed to bottom
Add .navbar-fixed-bottom instead.
-
+
@@ -1652,7 +1667,7 @@ body { padding-top: 70px; }
{% highlight html %}
-
+
...
{% endhighlight %}
@@ -1670,7 +1685,7 @@ body { padding-bottom: 70px; }
Static top
Create a full-width navbar that scrolls away with the page by adding .navbar-static-top. Unlike the .navbar-fixed-* classes, you do not need to change any padding on the body.
-
+
@@ -1693,7 +1708,7 @@ body { padding-bottom: 70px; }
diff --git a/javascript.html b/javascript.html
index 883bbb929..9e85c7742 100644
--- a/javascript.html
+++ b/javascript.html
@@ -355,7 +355,7 @@ $('#myModal').on('hidden.bs.modal', function () {
Within a navbar
-
+
Toggle navigation
@@ -526,7 +526,7 @@ $('#myDropdown').on('show.bs.dropdown', function () {
Example in navbar
The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.