Merge branch 'master' into gradient-prefix-cleanup

Conflicts:
	dist/css/bootstrap.min.css
	docs-assets/js/raw-files.js

4 files changed, 12 insertions, 5 deletions

diff --git a/less/buttons.less b/less/buttons.less
index ee6f6612a..0a484ead2 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -122,13 +122,12 @@
   // line-height: ensure even-numbered height of button next to large input
   .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large);
 }
-.btn-sm,
-.btn-xs {
+.btn-sm {
   // line-height: ensure proper height of button next to small input
   .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
 .btn-xs {
-  padding: 1px 5px;
+  .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small);
 }
 
 
diff --git a/less/mixins.less b/less/mixins.less
index 3d0aa679e..5c54c64c7 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -547,9 +547,10 @@
 // More easily include all the states for responsive-utilities.less.
 .responsive-visibility() {
   display: block !important;
-  tr& { display: table-row !important; }
+  table&  { display: table; }
+  tr&     { display: table-row !important; }
   th&,
-  td& { display: table-cell !important; }
+  td&     { display: table-cell !important; }
 }
 
 .responsive-invisibility() {
diff --git a/less/panels.less b/less/panels.less
index d782ffcde..a5ada2a2d 100644
--- a/less/panels.less
+++ b/less/panels.less
@@ -91,6 +91,10 @@
       }
     }
   }
+  > .table-responsive {
+    border: 0;
+    margin-bottom: 0;
+  }
 }
 
 
diff --git a/less/variables.less b/less/variables.less
index 120a65e06..1775be080 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -84,6 +84,9 @@
 @padding-small-vertical:         5px;
 @padding-small-horizontal:       10px;
 
+@padding-xs-vertical:            1px;
+@padding-xs-horizontal:          5px;
+
 @line-height-large:              1.33;
 @line-height-small:              1.5;