Merge branch '2.3.0-wip' into 3.0.0-wip

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less

diff --cc docs/assets/css/bootstrap.css
index 8d6dcca997e457d952e825bbed3efb3f8f4252c0,b2550569275a9ccdd26933c46818f664341c4a54..83b3c29c239b8e7f3087b8da2cdd866bfc130dc0
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -4648,58 -6156,3 +4651,71 @@@ a.counter:focus 
  .affix {
    position: fixed;
  }
 +
 +@-ms-viewport {
 +  width: device-width;
 +}
 +
 +.hidden {
 +  display: none;
 +  visibility: hidden;
 +}
 +
 +.visible-phone {
 +  display: none !important;
 +}
 +
 +.visible-tablet {
 +  display: none !important;
 +}
 +
 +.hidden-desktop {
 +  display: none !important;
 +}
 +
 +.visible-desktop {
 +  display: inherit !important;
 +}
 +
 +@media (min-width: 768px) and (max-width: 979px) {
 +  .hidden-desktop {
 +    display: inherit !important;
 +  }
 +  .visible-desktop {
 +    display: none !important ;
 +  }
 +  .visible-tablet {
 +    display: inherit !important;
 +  }
 +  .hidden-tablet {
 +    display: none !important;
 +  }
 +}
 +
 +@media (max-width: 767px) {
 +  .hidden-desktop {
 +    display: inherit !important;
 +  }
 +  .visible-desktop {
 +    display: none !important;
 +  }
 +  .visible-phone {
 +    display: inherit !important;
 +  }
 +  .hidden-phone {
 +    display: none !important;
 +  }
 +}
++
++.visible-print {
++  display: none !important;
++}
++
++@media print {
++  .visible-print {
++    display: inherit !important;
++  }
++  .hidden-print {
++    display: none !important;
++  }
++}

diff --cc docs/assets/js/bootstrap-carousel.js
Simple merge

diff --cc docs/assets/js/bootstrap-collapse.js
Simple merge

diff --cc docs/assets/js/bootstrap-dropdown.js
Simple merge

diff --cc docs/assets/js/bootstrap-popover.js
Simple merge

diff --cc docs/assets/js/bootstrap-tooltip.js
Simple merge

diff --cc docs/assets/js/bootstrap.js
index f0a03ee823007181c863852fe8120e597dc76f2d,bd4979f13568cea58df9edd2c05e56ef1fc8c87e..16d8d66c28a4f9f536deafc5af7f6bf51488420c
--- 1/docs/assets/js/bootstrap.js
--- 2/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@@ -788,14 -789,15 +789,15 @@@
     * =================================== */
  
    $(document)
-     .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
-     .on('click.dropdown.data-api touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-     .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
-     .on('click.dropdown.data-api touchstart.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-     .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+     .on('click.dropdown.data-api', clearMenus)
+     .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+     .on('.dropdown-menu', function (e) { e.stopPropagation() })
+     .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+     .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
  
- }(window.jQuery);/* =========================================================
+ }(window.jQuery);
+ /* =========================================================
 - * bootstrap-modal.js v2.3.0
 + * bootstrap-modal.js v3.0.0
   * http://twitter.github.com/bootstrap/javascript.html#modals
   * =========================================================
   * Copyright 2012 Twitter, Inc.

diff --cc docs/assets/js/bootstrap.min.js
Simple merge

diff --cc js/bootstrap-carousel.js
Simple merge

diff --cc js/bootstrap-collapse.js
Simple merge

diff --cc js/bootstrap-dropdown.js
Simple merge

diff --cc js/bootstrap-popover.js
Simple merge

diff --cc js/bootstrap-tooltip.js
Simple merge

diff --cc less/mixins.less
index fa74b301d39160f2a75c7aacebbf667fc633b8e4,79d889219f10a524f9bba26ec9751b1bbbbfb0e1..46241ab46bf8215ef919bbdb0eeb2e875d43871f
--- 1/less/mixins.less
--- 2/less/mixins.less
+++ b/less/mixins.less
@@@ -470,32 -572,131 +470,31 @@@
  // The Grid
  #grid {
  
 -  .core (@gridColumnWidth, @gridGutterWidth) {
 -
 -    .spanX (@index) when (@index > 0) {
 -      .span@{index} { .span(@index); }
 -      .spanX(@index - 1);
 -    }
 -    .spanX (0) {}
 -
 -    .offsetX (@index) when (@index > 0) {
 -      .offset@{index} { .offset(@index); }
 -      .offsetX(@index - 1);
 -    }
 -    .offsetX (0) {}
 -
 -    .offset (@columns) {
 -      margin-left: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns + 1));
 -    }
 -
 -    .span (@columns) {
 -      width: (@gridColumnWidth * @columns) + (@gridGutterWidth * (@columns - 1));
 -    }
 -
 -    .row {
 -      margin-left: @gridGutterWidth * -1;
 -      .clearfix();
 -    }
 -
 -    [class*="span"] {
 -      float: left;
 -      min-height: 1px; // prevent collapsing columns
 -      margin-left: @gridGutterWidth;
 -    }
 -
 -    // Set the container width, and override it for fixed navbars in media queries
 -    .container,
 -    .navbar-static-top .container,
 -    .navbar-fixed-top .container,
 -    .navbar-fixed-bottom .container { .span(@gridColumns); }
 -
 -    // generate .spanX and .offsetX
 -    .spanX (@gridColumns);
 -    .offsetX (@gridColumns);
 -
 -  }
 -
 -  .fluid (@fluidGridColumnWidth, @fluidGridGutterWidth) {
 +  .core(@grid-column-width, @grid-gutter-width) {
  
-     .spanX(@index) when (@index > 0) {
-       (~".span@{index}") { .span(@index); }
+     .spanX (@index) when (@index > 0) {
+       .span@{index} { .span(@index); }
        .spanX(@index - 1);
      }
 -    .spanX (0) {}
 +    .spanX(0) {}
  
-     .offsetX(@index) when (@index > 0) {
-       (~".offset@{index}") { .offset(@index); }
+     .offsetX (@index) when (@index > 0) {
+       .offset@{index} { .offset(@index); }
 -      .offset@{index}:first-child { .offsetFirstChild(@index); }
        .offsetX(@index - 1);
      }
-     .offsetX(0) {}
+     .offsetX (0) {}
  
 -    .offset (@columns) {
 -      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
 -        *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
 -    }
 -
 -    .offsetFirstChild (@columns) {
 -      margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth);
 -      *margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
 -    }
 -
 -    .span (@columns) {
 -      width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1));
 -      *width: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%);
 -    }
 -
 -    .row-fluid {
 -      width: 100%;
 -      .clearfix();
 -      [class*="span"] {
 -        .input-block-level();
 -        float: left;
 -        margin-left: @fluidGridGutterWidth;
 -        *margin-left: @fluidGridGutterWidth - (.5 / @gridRowWidth * 100 * 1%);
 -      }
 -      [class*="span"]:first-child {
 -        margin-left: 0;
 -      }
 -
 -      // Space grid-sized controls properly if multiple per line
 -      .controls-row [class*="span"] + [class*="span"] {
 -        margin-left: @fluidGridGutterWidth;
 -      }
 -
 -      // generate .spanX and .offsetX
 -      .spanX (@gridColumns);
 -      .offsetX (@gridColumns);
 -    }
 -
 -  }
 -
 -  .input(@gridColumnWidth, @gridGutterWidth) {
 -
 -    .spanX (@index) when (@index > 0) {
 -      input.span@{index}, textarea.span@{index}, .uneditable-input.span@{index} { .span(@index); }
 -      .spanX(@index - 1);
 +    // Base styles
 +    .offset(@columns) {
 +      margin-left: percentage(@columns / @grid-columns);
      }
 -    .spanX (0) {}
 -
      .span(@columns) {
 -      width: ((@gridColumnWidth) * @columns) + (@gridGutterWidth * (@columns - 1)) - 14;
 -    }
 -
 -    input,
 -    textarea,
 -    .uneditable-input {
 -      margin-left: 0; // override margin-left from core grid system
 -    }
 -
 -    // Space grid-sized controls properly if multiple per line
 -    .controls-row [class*="span"] + [class*="span"] {
 -      margin-left: @gridGutterWidth;
 +      width: percentage(@columns / @grid-columns);
      }
  
 -    // generate .spanX
 -    .spanX (@gridColumns);
 +    // Generate .spanX and .offsetX
 +    .spanX(@grid-columns);
 +    .offsetX(@grid-columns);
  
    }
- 
  }

diff --cc less/tooltip.less
index 65f5c7a82004ec496a437d7ac21d1274d929fd29,83d5f2bd765596c6c131a1f02dd58505bd6c95fa..e262e3ba58e6dbeed2805050d80df3e33ed68309
--- 1/less/tooltip.less
--- 2/less/tooltip.less
+++ b/less/tooltip.less
@@@ -6,18 -6,17 +6,18 @@@
  // Base class
  .tooltip {
    position: absolute;
 -  z-index: @zindexTooltip;
 +  z-index: @zindex-tooltip;
    display: block;
    visibility: visible;
-   padding: 5px;
    font-size: 11px;
    line-height: 1.4;
    .opacity(0);
 -  &.in     { .opacity(80); }
++
 +  &.in     { .opacity(100); }
-   &.top    { margin-top:  -3px; }
-   &.right  { margin-left:  3px; }
-   &.bottom { margin-top:   3px; }
-   &.left   { margin-left: -3px; }
+   &.top    { margin-top:  -3px; padding: 5px 0; }
+   &.right  { margin-left:  3px; padding: 0 5px; }
+   &.bottom { margin-top:   3px; padding: 5px 0; }
+   &.left   { margin-left: -3px; padding: 0 5px; }
  }
  
  // Wrapper for the tooltip content