resolve conflict

1 files changed, 35 insertions, 3 deletions

diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index b502d7fa7..7c286fc54 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Sep  2 22:09:02 PDT 2011
+ * Date: Fri Sep  2 22:09:40 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -429,6 +429,12 @@ body {
   max-width: 1180px;
   margin-left: 240px;
 }
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
 a {
   color: #0069d6;
   text-decoration: none;
@@ -734,6 +740,8 @@ textarea {
 input, select, textarea {
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
   -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
   transition: border linear 0.2s, box-shadow linear 0.2s;
   -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
   -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
@@ -1179,6 +1187,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
   box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
   -webkit-transition: none;
   -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
   transition: none;
 }
 .topbar input:-moz-placeholder {
@@ -1574,6 +1584,8 @@ footer {
   box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
   -webkit-transition: 0.1s linear all;
   -moz-transition: 0.1s linear all;
+  -ms-transition: 0.1s linear all;
+  -o-transition: 0.1s linear all;
   transition: 0.1s linear all;
 }
 .btn:hover {
@@ -1796,7 +1808,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
 }
 .modal-backdrop {
-  background-color: rgba(0, 0, 0, 0.5);
+  background-color: #000;
   position: fixed;
   top: 0;
   left: 0;
@@ -1804,13 +1816,22 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   bottom: 0;
   z-index: 1000;
 }
+.modal-backdrop.fade {
+  opacity: 0;
+}
+.modal-backdrop, .modal-backdrop.fade.in {
+  filter: alpha(opacity=50);
+  -khtml-opacity: 0.5;
+  -moz-opacity: 0.5;
+  opacity: 0.5;
+}
 .modal {
   position: fixed;
   top: 50%;
   left: 50%;
   z-index: 2000;
   width: 560px;
-  margin: -280px 0 0 -250px;
+  margin: -250px 0 0 -250px;
   background-color: #ffffff;
   border: 1px solid #999;
   border: 1px solid rgba(0, 0, 0, 0.3);
@@ -2007,3 +2028,14 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .popover .content p, .popover .content ul, .popover .content ol {
   margin-bottom: 0;
 }
+.fade {
+  -webkit-transition: opacity 0.15s linear;
+  -moz-transition: opacity 0.15s linear;
+  -ms-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+  opacity: 0;
+}
+.fade.in {
+  opacity: 1;
+}