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

6 files changed, 107 insertions, 4 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index ff95b0474e..ef11cf12aa 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -20,7 +20,7 @@
     }
     &:focus {
       // Remove focus outline when dropdown JS adds it after closing the menu
-      outline: none;
+      outline: 0;
     }
   }
 }
diff --git a/less/carousel.less b/less/carousel.less
index e3fb8a2cfd..6f5023756d 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -91,7 +91,7 @@
   // Hover/focus state
   &:hover,
   &:focus {
-    outline: none;
+    outline: 0;
     color: @carousel-control-color;
     text-decoration: none;
     .opacity(.9);
diff --git a/less/mixins.less b/less/mixins.less
index b608a1a8cf..2682b67f8b 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -774,6 +774,7 @@
 // Responsive utilities
 //
 // More easily include all the states for responsive-utilities.less.
+// Note: Deprecated .responsive-visibility() as of v3.2.0
 .responsive-visibility() {
   display: block !important;
   table&  { display: table; }
@@ -782,6 +783,7 @@
   td&     { display: table-cell !important; }
 }
 
+// Note: Deprecated .responsive-invisibility() as of v3.2.0
 .responsive-invisibility() {
   display: none !important;
 }
diff --git a/less/modals.less b/less/modals.less
index 0ba977e6d5..8438a1616a 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -54,7 +54,7 @@
   .box-shadow(0 3px 9px rgba(0,0,0,.5));
   background-clip: padding-box;
   // Remove focus outline from opened modal
-  outline: none;
+  outline: 0;
 }
 
 // Modal background
diff --git a/less/navbar.less b/less/navbar.less
index 2087e9c747..b5e9a5f8da 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -200,7 +200,7 @@
   // We remove the `outline` here, but later compensate by attaching `:hover`
   // styles to `:focus`.
   &:focus {
-    outline: none;
+    outline: 0;
   }
 
   // Bars
diff --git a/less/responsive-utilities.less b/less/responsive-utilities.less
index 027a264107..93f2e8ea89 100644
--- a/less/responsive-utilities.less
+++ b/less/responsive-utilities.less
@@ -23,6 +23,7 @@
 
 
 // Visibility utilities
+// Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
 .visible-xs,
 .visible-sm,
 .visible-md,
@@ -30,26 +31,104 @@
   .responsive-invisibility();
 }
 
+.visible-xs-block,
+.visible-xs-inline,
+.visible-xs-inline-block,
+.visible-sm-block,
+.visible-sm-inline,
+.visible-sm-inline-block,
+.visible-md-block,
+.visible-md-inline,
+.visible-md-inline-block,
+.visible-lg-block,
+.visible-lg-inline,
+.visible-lg-inline-block {
+  display: none !important;
+}
+
 .visible-xs {
   @media (max-width: @screen-xs-max) {
     .responsive-visibility();
   }
 }
+.visible-xs-block {
+  @media (max-width: @screen-xs-max) {
+    display: block !important;
+  }
+}
+.visible-xs-inline {
+  @media (max-width: @screen-xs-max) {
+    display: inline !important;
+  }
+}
+.visible-xs-inline-block {
+  @media (max-width: @screen-xs-max) {
+    display: inline-block !important;
+  }
+}
+
 .visible-sm {
   @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
     .responsive-visibility();
   }
 }
+.visible-sm-block {
+  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
+    display: block !important;
+  }
+}
+.visible-sm-inline {
+  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
+    display: inline !important;
+  }
+}
+.visible-sm-inline-block {
+  @media (min-width: @screen-sm-min) and (max-width: @screen-sm-max) {
+    display: inline-block !important;
+  }
+}
+
 .visible-md {
   @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
     .responsive-visibility();
   }
 }
+.visible-md-block {
+  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
+    display: block !important;
+  }
+}
+.visible-md-inline {
+  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
+    display: inline !important;
+  }
+}
+.visible-md-inline-block {
+  @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
+    display: inline-block !important;
+  }
+}
+
 .visible-lg {
   @media (min-width: @screen-lg-min) {
     .responsive-visibility();
   }
 }
+.visible-lg-block {
+  @media (min-width: @screen-lg-min) {
+    display: block !important;
+  }
+}
+.visible-lg-inline {
+  @media (min-width: @screen-lg-min) {
+    display: inline !important;
+  }
+}
+.visible-lg-inline-block {
+  @media (min-width: @screen-lg-min) {
+    display: inline-block !important;
+  }
+}
 
 .hidden-xs {
   @media (max-width: @screen-xs-max) {
@@ -77,6 +156,7 @@
 //
 // Media queries are placed on the inside to be mixin-friendly.
 
+// Note: Deprecated .visible-print as of v3.2.0
 .visible-print {
   .responsive-invisibility();
 
@@ -84,6 +164,27 @@
     .responsive-visibility();
   }
 }
+.visible-print-block {
+  display: none !important;
+
+  @media print {
+    display: block !important;
+  }
+}
+.visible-print-inline {
+  display: none !important;
+
+  @media print {
+    display: inline !important;
+  }
+}
+.visible-print-inline-block {
+  display: none !important;
+
+  @media print {
+    display: inline-block !important;
+  }
+}
 
 .hidden-print {
   @media print {