Merge branch 'master' into panels_and_tables

Conflicts:
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css

Gruntfile.js

@@ -44,6 +44,9 @@ module.exports = function (grunt) {
         jshintrc: 'js/.jshintrc'
       },
       grunt: {
+        options: {
+          node: true
+        },
         src: ['Gruntfile.js', 'grunt/*.js']
       },
       src: {
@@ -259,7 +262,7 @@ module.exports = function (grunt) {
       options: {
         inject: 'js/tests/unit/phantom.js'
       },
-      files: 'js/tests/*.html'
+      files: 'js/tests/index.html'
     },
 
     connect: {

dist/css/bootstrap.css

@@ -1939,6 +1939,9 @@ select[multiple].input-lg {
     width: auto;
     vertical-align: middle;
   }
+  .form-inline .input-group > .form-control {
+    width: 100%;
+  }
   .form-inline .control-label {
     margin-bottom: 0;
     vertical-align: middle;
@@ -3854,6 +3857,9 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
     width: auto;
     vertical-align: middle;
   }
+  .navbar-form .input-group > .form-control {
+    width: 100%;
+  }
   .navbar-form .control-label {
     margin-bottom: 0;
     vertical-align: middle;

docs/_includes/nav-components.html

@@ -102,7 +102,7 @@
   <a href="#progress">Progress bars</a>
   <ul class="nav">
     <li><a href="#progress-basic">Basic example</a></li>
-    <li><a href="#progress-labels">With label</a></li>
+    <li><a href="#progress-label">With label</a></li>
     <li><a href="#progress-alternatives">Contextual alternatives</a></li>
     <li><a href="#progress-striped">Striped</a></li>
     <li><a href="#progress-animated">Animated</a></li>

docs/assets/js/customizer.js

@@ -6,7 +6,7 @@
  * details, see http://creativecommons.org/licenses/by/3.0/.
  */
 
-/* jshint multistr:true */
+/* jshint multistr: true */
 
 window.onload = function () { // wait for load in a dumb way because B-0
   var cw = '/*!\n' +

docs/css.html

@@ -3240,7 +3240,7 @@ a {
   <p>Easily truncate text with an ellipsis with a single mixin. <strong>Requires element to be <code>block</code> or <code>inline-block</code> level.</strong></p>
 {% highlight scss %}
 // Mixin
-.text-truncate() {
+.text-overflow() {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -3250,7 +3250,7 @@ a {
 .branch-name {
   display: inline-block;
   max-width: 200px;
-  .text-truncate();
+  .text-overflow();
 }
 {% endhighlight %}
 

docs/examples/dashboard/dashboard.css

@@ -29,12 +29,12 @@ body {
 @media (min-width: 768px) {
   .sidebar {
     position: fixed;
-    top: 0;
+    top: 51px;
     bottom: 0;
     left: 0;
     z-index: 1000;
     display: block;
-    padding: 70px 20px 20px;
+    padding: 20px;
     overflow-x: hidden;
     overflow-y: auto; /* Scrollable contents if viewport is shorter than content. */
     background-color: #f5f5f5;

grunt/bs-glyphicons-data-generator.js

-/* jshint node: true */
 /*!
  * Bootstrap Grunt task for Glyphicons data generation
  * http://getbootstrap.com

grunt/bs-lessdoc-parser.js

-/* jshint node: true */
 /*!
  * Bootstrap Grunt task for parsing Less docstrings
  * http://getbootstrap.com

grunt/bs-raw-files-generator.js

-/* jshint node: true */
 /* global btoa: true */
 
 /*!

grunt/shrinkwrap.js

-/* jshint node: true */
-
 /*
 This Grunt task updates the npm-shrinkwrap.canonical.json file that's used as the key for Bootstrap's npm packages cache.
 This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.

less/forms.less

@@ -133,9 +133,10 @@ output {
   .placeholder();
 
   // Disabled and read-only inputs
-  // Note: HTML5 says that controls under a fieldset > legend:first-child won't
-  // be disabled if the fieldset is disabled. Due to implementation difficulty,
-  // we don't honor that edge case; we style them as disabled anyway.
+  //
+  // HTML5 says that controls under a fieldset > legend:first-child won't be
+  // disabled if the fieldset is disabled. Due to implementation difficulty, we
+  // don't honor that edge case; we style them as disabled anyway.
   &[disabled],
   &[readonly],
   fieldset[disabled] & {
@@ -348,6 +349,10 @@ input[type="checkbox"],
       width: auto; // Prevent labels from stacking above inputs in `.form-group`
       vertical-align: middle;
     }
+    // Input groups need that 100% width though
+    .input-group > .form-control {
+      width: 100%;
+    }
 
     .control-label {
       margin-bottom: 0;