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

3 files changed, 19 insertions, 11 deletions

diff --git a/less/mixins.less b/less/mixins.less
index fa74b301d..46241ab46 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -472,17 +472,17 @@
 
   .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) {}
 
-    .offsetX(@index) when (@index > 0) {
-      (~".offset@{index}") { .offset(@index); }
+    .offsetX (@index) when (@index > 0) {
+      .offset@{index} { .offset(@index); }
       .offsetX(@index - 1);
     }
-    .offsetX(0) {}
+    .offsetX (0) {}
 
     // Base styles
     .offset(@columns) {
@@ -497,5 +497,4 @@
     .offsetX(@grid-columns);
 
   }
-
 }
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less
index 1ed1a1369..bf43e8ef7 100644
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
@@ -48,3 +48,12 @@
   // Hide
   .hidden-phone      { display: none !important; }
 }
+
+// Print utilities
+.visible-print    { display: none !important; }
+.hidden-print     { }
+
+@media print {
+  .visible-print  { display: inherit !important; }
+  .hidden-print   { display: none !important; }
+}
diff --git a/less/tooltip.less b/less/tooltip.less
index 65f5c7a82..e262e3ba5 100644
--- a/less/tooltip.less
+++ b/less/tooltip.less
@@ -9,15 +9,15 @@
   z-index: @zindex-tooltip;
   display: block;
   visibility: visible;
-  padding: 5px;
   font-size: 11px;
   line-height: 1.4;
   .opacity(0);
+
   &.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