Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache

diff --cc docs/assets/css/bootstrap.css
index 309b07b28cd5bee2b1c957a69af6d3f407939dc5,b921274a02dee91bf6ec9b3f8ee3474cab2d466e..5bde2636e27cffeeeca9fa8462fa94656ead6ad9
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -128,6 -137,90 +128,58 @@@ textarea 
    vertical-align: top;
  }
  
 -.clearfix {
 -  *zoom: 1;
 -}
 -
 -.clearfix:before,
 -.clearfix:after {
 -  display: table;
 -  line-height: 0;
 -  content: "";
 -}
 -
 -.clearfix:after {
 -  clear: both;
 -}
 -
 -.hide-text {
 -  font: 0/0 a;
 -  color: transparent;
 -  text-shadow: none;
 -  background-color: transparent;
 -  border: 0;
 -}
 -
 -.input-block-level {
 -  display: block;
 -  width: 100%;
 -  min-height: 30px;
 -  -webkit-box-sizing: border-box;
 -     -moz-box-sizing: border-box;
 -          box-sizing: border-box;
 -}
 -
+ @media print {
+   * {
+     color: #000 !important;
+     text-shadow: none !important;
+     background: transparent !important;
+     box-shadow: none !important;
+   }
+   a,
+   a:visited {
+     text-decoration: underline;
+   }
+   a[href]:after {
+     content: " (" attr(href) ")";
+   }
+   abbr[title]:after {
+     content: " (" attr(title) ")";
+   }
+   .ir a:after,
+   a[href^="javascript:"]:after,
+   a[href^="#"]:after {
+     content: "";
+   }
+   pre,
+   blockquote {
+     border: 1px solid #999;
+     page-break-inside: avoid;
+   }
+   thead {
+     display: table-header-group;
+   }
+   tr,
+   img {
+     page-break-inside: avoid;
+   }
+   img {
+     max-width: 100% !important;
+   }
+   @page  {
+     margin: 0.5cm;
+   }
+   p,
+   h2,
+   h3 {
+     orphans: 3;
+     widows: 3;
+   }
+   h2,
+   h3 {
+     page-break-after: avoid;
+   }
+ }
+ 
  body {
    margin: 0;
    font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@@ -4773,9 -5475,16 +4826,14 @@@ a.thumbnail:hover 
  .badge {
    padding-right: 9px;
    padding-left: 9px;
 -  -webkit-border-radius: 9px;
 -     -moz-border-radius: 9px;
 -          border-radius: 9px;
 +  border-radius: 9px;
  }
  
+ .label:empty,
+ .badge:empty {
+   display: none;
+ }
+ 
  a.label:hover,
  a.badge:hover {
    color: #ffffff;

diff --cc docs/assets/css/docs.css
index 8af21ddefa134c34d3a6e2e7381e63b585a1d563,c08d529aa180b2c84eb5aca97a4009d4848aff41..8852926d3b56b9df59d74faacb5ba7c52bb27c2c
--- 1/docs/assets/css/docs.css
--- 2/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@@ -328,18 -335,15 +328,24 @@@ hr.soften 
    margin-bottom: 0;
  }
  .show-grid .show-grid [class*="span"] {
+   margin-top: 5px;
+ }
+ .show-grid [class*="span"] [class*="span"] {
    background-color: #ccc;
  }
+ .show-grid [class*="span"] [class*="span"] [class*="span"] {
+   background-color: #999;
+ }
  
 +.show-grid [class*="span"]:nth-child(even) {
 +  background-color: #ddd;
 +}
 +
 +.show-grid [class*="span"]:hover {
 +  background-color: #333;
 +  color: #fff;
 +  cursor: pointer;
 +}
  
  
  /* Mini layout previews

diff --cc docs/base-css.html
Simple merge

diff --cc docs/components.html
Simple merge

diff --cc docs/customize.html
Simple merge

diff --cc docs/javascript.html
Simple merge

diff --cc docs/scaffolding.html
index d8273e9107631b08b893c1ceb81b3d69a9919e1f,5261ea61607fbd406b5b074423d53dadb204d586..596379c87e3807c3559787bf49c3a64da3fb3a4c
--- 1/docs/scaffolding.html
--- 2/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@@ -228,7 -227,125 +228,6 @@@
  
  
  
 -        <!-- Fluid grid system
 -        ================================================== -->
 -        <section id="fluidGridSystem">
 -          <div class="page-header">
 -            <h1>Fluid grid system</h1>
 -          </div>
 -
 -          <h2>Live fluid grid example</h2>
 -          <p>The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.</p>
 -          <div class="bs-docs-grid">
 -            <div class="row-fluid show-grid">
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span4">4</div>
 -              <div class="span4">4</div>
 -              <div class="span4">4</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span4">4</div>
 -              <div class="span8">8</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span6">6</div>
 -              <div class="span6">6</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span12">12</div>
 -            </div>
 -          </div>
 -
 -          <h3>Basic fluid grid HTML</h3>
 -          <p>Make any row "fluid" by changing <code>.row</code> to <code>.row-fluid</code>. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.</p>
 -<pre class="prettyprint linenums">
 -&lt;div class="row-fluid"&gt;
 -  &lt;div class="span4"&gt;...&lt;/div&gt;
 -  &lt;div class="span8"&gt;...&lt;/div&gt;
 -&lt;/div&gt;
 -</pre>
 -
 -          <h2>Fluid offsetting</h2>
 -          <p>Operates the same way as the fixed grid system offsetting: add <code>.offset*</code> to any column to offset by that many columns.</p>
 -          <div class="bs-docs-grid">
 -            <div class="row-fluid show-grid">
 -              <div class="span4">4</div>
 -              <div class="span4 offset4">4 offset 4</div>
 -            </div><!-- /row -->
 -            <div class="row-fluid show-grid">
 -              <div class="span3 offset3">3 offset 3</div>
 -              <div class="span3 offset3">3 offset 3</div>
 -            </div><!-- /row -->
 -            <div class="row-fluid show-grid">
 -              <div class="span6 offset6">6 offset 6</div>
 -            </div><!-- /row -->
 -          </div>
 -<pre class="prettyprint linenums">
 -&lt;div class="row-fluid"&gt;
 -  &lt;div class="span4"&gt;...&lt;/div&gt;
 -  &lt;div class="span4 offset2"&gt;...&lt;/div&gt;
 -&lt;/div&gt;
 -</pre>
 -
 -          <h2>Fluid nesting</h2>
 -          <p>Fluid grids utilize nesting differently: each nested level of columns should add up to 12 columns. This is because the fluid grid uses percentages, not pixels, for setting widths.</p>
 -          <div class="row-fluid show-grid">
 -            <div class="span12">
 -              Fluid 12
 -              <div class="row-fluid show-grid">
 -                <div class="span6">
 -                  Fluid 6
 -                  <div class="row-fluid show-grid">
 -                    <div class="span6">
 -                      Fluid 6
 -                    </div>
 -                    <div class="span6">
 -                      Fluid 6
 -                    </div>
 -                  </div>
 -                </div>
 -                <div class="span6">
 -                  Fluid 6
 -                </div>
 -              </div>
 -            </div>
 -          </div>
 -<pre class="prettyprint linenums">
 -&lt;div class="row-fluid"&gt;
 -  &lt;div class="span12"&gt;
 -    Fluid 12
 -    &lt;div class="row-fluid"&gt;
 -      &lt;div class="span6"&gt;
 -        Fluid 6
 -        &lt;div class="row-fluid"&gt;
 -          &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
 -          &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
 -        &lt;/div&gt;
 -      &lt;/div&gt;
 -      &lt;div class="span6"&gt;Fluid 6&lt;/div&gt;
 -    &lt;/div&gt;
 -  &lt;/div&gt;
 -&lt;/div&gt;
 -</pre>
 -
 -        </section>
 -
 -
 -
--
          <!-- Layouts (Default and fluid)
          ================================================== -->
          <section id="layouts">

diff --cc docs/templates/pages/base-css.mustache
Simple merge

diff --cc docs/templates/pages/components.mustache
Simple merge

diff --cc docs/templates/pages/javascript.mustache
Simple merge

diff --cc docs/templates/pages/scaffolding.mustache
index 8da12d0a5176a1db61f6480a7517b3165d150a1a,99bdb46f5e93a0059d4f44c36e8730d692308658..6818bf459c158a3cd192797f0bd7b011d4856fa4
--- 1/docs/templates/pages/scaffolding.mustache
--- 2/docs/templates/pages/scaffolding.mustache
+++ b/docs/templates/pages/scaffolding.mustache
@@@ -159,7 -156,125 +159,6 @@@
  
  
  
 -        <!-- Fluid grid system
 -        ================================================== -->
 -        <section id="fluidGridSystem">
 -          <div class="page-header">
 -            <h1>{{_i}}Fluid grid system{{/i}}</h1>
 -          </div>
 -
 -          <h2>{{_i}}Live fluid grid example{{/i}}</h2>
 -          <p>{{_i}}The fluid grid system uses percents instead of pixels for column widths. It has the same responsive capabilities as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.{{/i}}</p>
 -          <div class="bs-docs-grid">
 -            <div class="row-fluid show-grid">
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -              <div class="span1">1</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span4">4</div>
 -              <div class="span4">4</div>
 -              <div class="span4">4</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span4">4</div>
 -              <div class="span8">8</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span6">6</div>
 -              <div class="span6">6</div>
 -            </div>
 -            <div class="row-fluid show-grid">
 -              <div class="span12">12</div>
 -            </div>
 -          </div>
 -
 -          <h3>{{_i}}Basic fluid grid HTML{{/i}}</h3>
 -          <p>{{_i}}Make any row "fluid" by changing <code>.row</code> to <code>.row-fluid</code>. The column classes stay the exact same, making it easy to flip between fixed and fluid grids.{{/i}}</p>
 -<pre class="prettyprint linenums">
 -&lt;div class="row-fluid"&gt;
 -  &lt;div class="span4"&gt;...&lt;/div&gt;
 -  &lt;div class="span8"&gt;...&lt;/div&gt;
 -&lt;/div&gt;
 -</pre>
 -
 -          <h2>{{_i}}Fluid offsetting{{/i}}</h2>
 -          <p>{{_i}}Operates the same way as the fixed grid system offsetting: add <code>.offset*</code> to any column to offset by that many columns.{{/i}}</p>
 -          <div class="bs-docs-grid">
 -            <div class="row-fluid show-grid">
 -              <div class="span4">4</div>
 -              <div class="span4 offset4">4 offset 4</div>
 -            </div><!-- /row -->
 -            <div class="row-fluid show-grid">
 -              <div class="span3 offset3">3 offset 3</div>
 -              <div class="span3 offset3">3 offset 3</div>
 -            </div><!-- /row -->
 -            <div class="row-fluid show-grid">
 -              <div class="span6 offset6">6 offset 6</div>
 -            </div><!-- /row -->
 -          </div>
 -<pre class="prettyprint linenums">
 -&lt;div class="row-fluid"&gt;
 -  &lt;div class="span4"&gt;...&lt;/div&gt;
 -  &lt;div class="span4 offset2"&gt;...&lt;/div&gt;
 -&lt;/div&gt;
 -</pre>
 -
 -          <h2>{{_i}}Fluid nesting{{/i}}</h2>
 -          <p>{{_i}}Fluid grids utilize nesting differently: each nested level of columns should add up to 12 columns. This is because the fluid grid uses percentages, not pixels, for setting widths.{{/i}}</p>
 -          <div class="row-fluid show-grid">
 -            <div class="span12">
 -              {{_i}}Fluid 12{{/i}}
 -              <div class="row-fluid show-grid">
 -                <div class="span6">
 -                  {{_i}}Fluid 6{{/i}}
 -                  <div class="row-fluid show-grid">
 -                    <div class="span6">
 -                      {{_i}}Fluid 6{{/i}}
 -                    </div>
 -                    <div class="span6">
 -                      {{_i}}Fluid 6{{/i}}
 -                    </div>
 -                  </div>
 -                </div>
 -                <div class="span6">
 -                  {{_i}}Fluid 6{{/i}}
 -                </div>
 -              </div>
 -            </div>
 -          </div>
 -<pre class="prettyprint linenums">
 -&lt;div class="row-fluid"&gt;
 -  &lt;div class="span12"&gt;
 -    {{_i}}Fluid 12{{/i}}
 -    &lt;div class="row-fluid"&gt;
 -      &lt;div class="span6"&gt;
 -        {{_i}}Fluid 6{{/i}}
 -        &lt;div class="row-fluid"&gt;
 -          &lt;div class="span6"&gt;{{_i}}Fluid 6{{/i}}&lt;/div&gt;
 -          &lt;div class="span6"&gt;{{_i}}Fluid 6{{/i}}&lt;/div&gt;
 -        &lt;/div&gt;
 -      &lt;/div&gt;
 -      &lt;div class="span6"&gt;{{_i}}Fluid 6{{/i}}&lt;/div&gt;
 -    &lt;/div&gt;
 -  &lt;/div&gt;
 -&lt;/div&gt;
 -</pre>
 -
 -        </section>
 -
 -
 -
--
          <!-- Layouts (Default and fluid)
          ================================================== -->
          <section id="layouts">

diff --cc less/labels-badges.less
index 02da1654d5c68804d10e900ae10a3eeec430d40b,9c3a40bfbf8231b4310990e708ddc4296579a1ea..3ca0d6e2002f9948e1697ebe219f290c29870316
--- 1/less/labels-badges.less
--- 2/less/labels-badges.less
+++ b/less/labels-badges.less
@@@ -24,9 -24,17 +24,17 @@@
  .badge {
    padding-left: 9px;
    padding-right: 9px;
 -  .border-radius(9px);
 +  border-radius: 9px;
  }
  
+ // Empty labels/badges collapse
+ .label,
+ .badge {
+   &:empty {
+     display: none;
+   }
+ }
+ 
  // Hover state, but only for links
  a {
    &.label:hover,

diff --cc less/popovers.less
index c4e84c0fd66556e07f0ac17d17697f59de85421b,4a36db4e8de64a0ff8c6b20aaf8aa24372ec0050..256aa945141c45669dae22efa8705a5cc4637414
--- 1/less/popovers.less
--- 2/less/popovers.less
+++ b/less/popovers.less
@@@ -17,9 -17,12 +17,12 @@@
            background-clip: padding-box;
    border: 1px solid #ccc;
    border: 1px solid rgba(0,0,0,.2);
 -  .border-radius(6px);
 +  border-radius: 6px;
    .box-shadow(0 5px 10px rgba(0,0,0,.2));
  
+   // Overrides for proper insertion
+   white-space: normal;
+ 
    // Offset the popover to account for the popover arrow
    &.top     { margin-top: -10px; }
    &.right   { margin-left: 10px; }

diff --cc less/reset.less
index e8e5c1589269bbe1d9f70be4336b08a668ffb0c1,aec4687638610400b94dbe39baffb02e94b9e129..d26b2a2ae9d0eaec0b93ac86e664a86adc7b971d
--- 1/less/reset.less
--- 2/less/reset.less
+++ b/less/reset.less
@@@ -133,3 -144,73 +133,73 @@@ textarea 
    overflow: auto; // Remove vertical scrollbar in IE6-9
    vertical-align: top; // Readability and alignment cross-browser
  }
 -}
+ 
+ 
+ // Printing
+ // -------------------------
+ // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
+ 
+ @media print {
+ 
+   * {
+     text-shadow: none !important;
+     color: #000 !important; // Black prints faster: h5bp.com/s
+     background: transparent !important;
+     box-shadow: none !important;
+   }
+ 
+   a,
+   a:visited {
+     text-decoration: underline;
+   }
+ 
+   a[href]:after {
+     content: " (" attr(href) ")";
+   }
+ 
+   abbr[title]:after {
+     content: " (" attr(title) ")";
+   }
+ 
+   // Don't show links for images, or javascript/internal links
+   .ir a:after,
+   a[href^="javascript:"]:after,
+   a[href^="#"]:after {
+     content: "";
+   }
+ 
+   pre,
+   blockquote {
+     border: 1px solid #999;
+     page-break-inside: avoid;
+   }
+ 
+   thead {
+     display: table-header-group; // h5bp.com/t
+   }
+ 
+   tr,
+   img {
+     page-break-inside: avoid;
+   }
+ 
+   img {
+     max-width: 100% !important;
+   }
+ 
+   @page {
+     margin: 0.5cm;
+   }
+ 
+   p,
+   h2,
+   h3 {
+     orphans: 3;
+     widows: 3;
+   }
+ 
+   h2,
+   h3 {
+     page-break-after: avoid;
+   }
++}