Merge branch 'master' into docs_derp

1 files changed, 2 insertions, 21 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 6aef1f6fd..68e8b8c75 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -740,7 +740,7 @@ code,
 kbd,
 pre,
 samp {
-  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
 }
 
 code {
@@ -3462,7 +3462,6 @@ input[type="button"].btn-block {
   vertical-align: middle;
   border-top: 4px solid #000000;
   border-right: 4px solid transparent;
-  border-bottom: 0 dotted;
   border-left: 4px solid transparent;
 }
 
@@ -3580,7 +3579,7 @@ input[type="button"].btn-block {
 
 .dropup .caret,
 .navbar-fixed-bottom .dropdown .caret {
-  border-top: 0 dotted;
+  border-top: 0;
   border-bottom: 4px solid #000000;
   content: "";
 }
@@ -5396,24 +5395,6 @@ a.thumbnail.active {
   }
 }
 
-@-moz-keyframes progress-bar-stripes {
-  from {
-    background-position: 40px 0;
-  }
-  to {
-    background-position: 0 0;
-  }
-}
-
-@-o-keyframes progress-bar-stripes {
-  from {
-    background-position: 0 0;
-  }
-  to {
-    background-position: 40px 0;
-  }
-}
-
 @keyframes progress-bar-stripes {
   from {
     background-position: 40px 0;