Merge branch 'master' of http://git.roojs.com/roojs1

[roojs1] / css-bootstrap / bootstrap.css

diff --git a/css-bootstrap/bootstrap.css b/css-bootstrap/bootstrap.css
index 988cf85..0fc3ce4 100644 (file)
--- a/css-bootstrap/bootstrap.css
+++ b/css-bootstrap/bootstrap.css
@@ -1,3 +1,6 @@
+/*
+* Consider remove or merge these...
+*/
 /*!
  * Bootstrap v3.4.0 (http://getbootstrap.com)
  * Copyright 2011-2016 Twitter, Inc.
@@ -183,14 +186,16 @@ th {
 }
 /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
 @media print {
-  *,
-  *:before,
-  *:after {
-    background: transparent !important;
-    color: #000 !important;
-    box-shadow: none !important;
-    text-shadow: none !important;
-  }
+  /*    
+    *,
+    *:before,
+    *:after {
+        background: transparent !important;
+        color: #000 !important; // Black prints faster: h5bp.com/s
+        box-shadow: none !important;
+        text-shadow: none !important;
+    }
+*/
   a,
   a:visited {
     text-decoration: underline;
@@ -3453,6 +3458,11 @@ input[type="reset"].btn-block,
 input[type="button"].btn-block {
   width: 100%;
 }
+.x-btn-text-icon .x-btn-center .x-btn-text-no-padding {
+  background-position: 0 2px;
+  background: none no-repeat scroll 0 0 transparent;
+  padding: 1px 0px 1px;
+}
 .fade {
   opacity: 0;
   -webkit-transition: opacity 0.15s linear;
@@ -6724,3 +6734,4 @@ button.close {
     display: none !important;
   }
 }
+/*# sourceMappingURL=bootstrap.css.map */
\ No newline at end of file