Merge branch 'master' of github.com:twbs/bootstrap

docs/_includes/customizer-variables.html

@@ -379,7 +379,6 @@
   </div>
 </div>
 <h2 id="forms">Forms</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@input-bg">@input-bg</label>
@@ -653,7 +652,6 @@
   </div>
 </div>
 <h2 id="navbar">Navbar</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@navbar-height">@navbar-height</label>
@@ -809,7 +807,6 @@
   </div>
 </div>
 <h2 id="navs">Navs</h2>
-<p></p>
 <h3 id="shared-nav-styles">Shared nav styles</h3>
 <div class="row">
   <div class="bs-customizer-input">
@@ -876,7 +873,6 @@
   </div>
 </div>
 <h2 id="pagination">Pagination</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@pagination-color">@pagination-color</label>
@@ -928,7 +924,6 @@
   </div>
 </div>
 <h2 id="pager">Pager</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@pager-bg">@pager-bg</label>
@@ -960,7 +955,6 @@
   </div>
 </div>
 <h2 id="jumbotron">Jumbotron</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@jumbotron-padding">@jumbotron-padding</label>
@@ -1036,7 +1030,6 @@
   </div>
 </div>
 <h2 id="tooltips">Tooltips</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@tooltip-max-width">@tooltip-max-width</label>
@@ -1069,7 +1062,6 @@
   </div>
 </div>
 <h2 id="popovers">Popovers</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@popover-bg">@popover-bg</label>
@@ -1123,7 +1115,6 @@
   </div>
 </div>
 <h2 id="labels">Labels</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@label-default-bg">@label-default-bg</label>
@@ -1167,7 +1158,6 @@
   </div>
 </div>
 <h2 id="modals">Modals</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@modal-inner-padding">@modal-inner-padding</label>
@@ -1297,7 +1287,6 @@
   </div>
 </div>
 <h2 id="progress-bars">Progress bars</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@progress-bg">@progress-bg</label>
@@ -1341,7 +1330,6 @@
   </div>
 </div>
 <h2 id="list-group">List group</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@list-group-bg">@list-group-bg</label>
@@ -1412,7 +1400,6 @@
   </div>
 </div>
 <h2 id="panels">Panels</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@panel-bg">@panel-bg</label>
@@ -1517,7 +1504,6 @@
   </div>
 </div>
 <h2 id="thumbnails">Thumbnails</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@thumbnail-padding">@thumbnail-padding</label>
@@ -1551,7 +1537,6 @@
   </div>
 </div>
 <h2 id="wells">Wells</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@well-bg">@well-bg</label>
@@ -1563,7 +1548,6 @@
   </div>
 </div>
 <h2 id="badges">Badges</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@badge-color">@badge-color</label>
@@ -1592,13 +1576,16 @@
     <label for="input-@badge-font-weight">@badge-font-weight</label>
     <input id="input-@badge-font-weight" type="text" value="bold" data-var="@badge-font-weight" class="form-control"/>
   </div>
+  <div class="bs-customizer-input">
+    <label for="input-@badge-line-height">@badge-line-height</label>
+    <input id="input-@badge-line-height" type="text" value="1" data-var="@badge-line-height" class="form-control"/>
+  </div>
   <div class="bs-customizer-input">
     <label for="input-@badge-border-radius">@badge-border-radius</label>
     <input id="input-@badge-border-radius" type="text" value="10px" data-var="@badge-border-radius" class="form-control"/>
   </div>
 </div>
 <h2 id="breadcrumbs">Breadcrumbs</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@breadcrumb-padding-vertical">@breadcrumb-padding-vertical</label>
@@ -1630,7 +1617,6 @@
   </div>
 </div>
 <h2 id="carousel">Carousel</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@carousel-text-shadow">@carousel-text-shadow</label>
@@ -1666,7 +1652,6 @@
   </div>
 </div>
 <h2 id="close">Close</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@close-font-weight">@close-font-weight</label>
@@ -1682,7 +1667,6 @@
   </div>
 </div>
 <h2 id="code">Code</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@code-color">@code-color</label>
@@ -1718,7 +1702,6 @@
   </div>
 </div>
 <h2 id="type">Type</h2>
-<p></p>
 <div class="row">
   <div class="bs-customizer-input">
     <label for="input-@component-offset-horizontal">@component-offset-horizontal</label>

grunt/bs-commonjs-generator.js

@@ -2,7 +2,7 @@
 var fs = require('fs');
 var path = require('path');
 
-var COMMONJS_BANNER = '// This file is generated. You can require() it in a CommonJS environment.\n';
+var COMMONJS_BANNER = '// This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.\n';
 
 module.exports = function generateCommonJSModule(grunt, srcFiles, destFilepath) {
   var destDir = path.dirname(destFilepath);

grunt/bs-lessdoc-parser.js

@@ -33,9 +33,9 @@ Mini-language:
 var CUSTOMIZABLE_HEADING = /^[/]{2}={2}(.*)$/;
 var UNCUSTOMIZABLE_HEADING = /^[/]{2}-{2}(.*)$/;
 var SUBSECTION_HEADING = /^[/]{2}={3}(.*)$/;
-var SECTION_DOCSTRING = /^[/]{2}#{2}(.*)$/;
-var VAR_ASSIGNMENT = /^(@[a-zA-Z0-9_-]+):[ ]*([^ ;][^;]+);[ ]*$/;
-var VAR_DOCSTRING = /^[/]{2}[*]{2}(.*)$/;
+var SECTION_DOCSTRING = /^[/]{2}#{2}(.+)$/;
+var VAR_ASSIGNMENT = /^(@[a-zA-Z0-9_-]+):[ ]*([^ ;][^;]*);[ ]*$/;
+var VAR_DOCSTRING = /^[/]{2}[*]{2}(.+)$/;
 
 function Section(heading, customizable) {
   this.heading = heading.trim();