Merge branch 'master' into docs_derp

4 files changed, 26 insertions, 35 deletions

diff --git a/less/dropdowns.less b/less/dropdowns.less
index 5d7e0fb4e..dbaf31fe0 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -13,9 +13,6 @@
   border-top:   @caret-width-base solid @dropdown-caret-color;
   border-right: @caret-width-base solid transparent;
   border-left:  @caret-width-base solid transparent;
-  // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
-  // we can just straight up remove this.
-  border-bottom: 0 dotted;
 }
 
 // The dropdown wrapper (div)
@@ -163,9 +160,7 @@
 .navbar-fixed-bottom .dropdown {
   // Reverse the caret
   .caret {
-    // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
-    // gets fixed, restore `border-top: 0;`.
-    border-top: 0 dotted;
+    border-top: 0;
     border-bottom: @caret-width-base solid @dropdown-caret-color;
     content: "";
   }
diff --git a/less/progress-bars.less b/less/progress-bars.less
index 507c82dbd..76c87be17 100644
--- a/less/progress-bars.less
+++ b/less/progress-bars.less
@@ -12,18 +12,6 @@
   to    { background-position: 0 0; }
 }
 
-// Firefox
-@-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Opera
-@-o-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
 // Spec and IE10+
 @keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
diff --git a/less/tables.less b/less/tables.less
index 0deadc782..4c4284cb1 100644
--- a/less/tables.less
+++ b/less/tables.less
@@ -104,10 +104,12 @@ th {
 //
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
 
-.table-striped > tbody > tr:nth-child(odd) {
-  > td,
-  > th {
-    background-color: @table-bg-accent;
+.table-striped {
+  > tbody > tr:nth-child(odd) {
+    > td,
+    > th {
+      background-color: @table-bg-accent;
+    }
   }
 }
 
@@ -116,10 +118,12 @@ th {
 //
 // Placed here since it has to come after the potential zebra striping
 
-.table-hover > tbody > tr:hover {
-  > td,
-  > th {
-    background-color: @table-bg-hover;
+.table-hover {
+  > tbody > tr:hover {
+    > td,
+    > th {
+      background-color: @table-bg-hover;
+    }
   }
 }
 
@@ -148,14 +152,18 @@ table {
 // Exact selectors below required to override `.table-striped` and prevent
 // inheritance to nested tables.
 
-.table > thead > tr,
-.table > tbody > tr,
-.table > tfoot > tr {
-  > td.active,
-  > th.active,
-  &.active > td,
-  &.active > th  {
-    background-color: @table-bg-active;
+.table {
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > td.active,
+      > th.active,
+      &.active > td,
+      &.active > th  {
+        background-color: @table-bg-active;
+      }
+    }
   }
 }
 
diff --git a/less/variables.less b/less/variables.less
index e596215d0..08bb701db 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -41,7 +41,7 @@
 
 @font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif;
 @font-family-serif:       Georgia, "Times New Roman", Times, serif;
-@font-family-monospace:   Monaco, Menlo, Consolas, "Courier New", monospace;
+@font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
 @font-family-base:        @font-family-sans-serif;
 
 @font-size-base:          14px;