Merge branch 'master' into pr/11648

Conflicts:
	dist/css/bootstrap.min.css
	less/grid.less

less/mixins.less

@@ -19,8 +19,8 @@
 .clearfix() {
   &:before,
   &:after {
-    content: " "; /* 1 */
-    display: table; /* 2 */
+    content: " "; // 1
+    display: table; // 2
   }
   &:after {
     clear: both;
@@ -428,27 +428,27 @@
 
 // Tables
 // -------------------------
-.table-row-variant(@state; @background; @border) {
+.table-row-variant(@state; @background) {
   // Exact selectors below required to override `.table-striped` and prevent
   // inheritance to nested tables.
-  .table > thead > tr,
-  .table > tbody > tr,
-  .table > tfoot > tr {
-    > td.@{state},
-    > th.@{state},
-    &.@{state} > td,
-    &.@{state} > th {
-      background-color: @background;
+  .table {
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr > .@{state},
+      > .@{state} > td,
+      > .@{state} > th {
+        background-color: @background;
+      }
     }
   }
 
   // Hover states for `.table-hover`
   // Note: this is not available for cells or rows within `thead` or `tfoot`.
-  .table-hover > tbody > tr {
-    > td.@{state}:hover,
-    > th.@{state}:hover,
-    &.@{state}:hover > td,
-    &.@{state}:hover > th {
+  .table-hover > tbody {
+    > tr > .@{state}:hover,
+    > .@{state}:hover > td,
+    > .@{state}:hover > th {
       background-color: darken(@background, 5%);
     }
   }