resolve conflict

lib/patterns.less

@@ -559,7 +559,6 @@ input[type=submit].btn {
     padding: 14px;
     border-color: #fceec1;
     .box-shadow(none);
-
     p {
       margin-right: 30px;
     }
@@ -649,7 +648,10 @@ input[type=submit].btn {
 // ------
 
 .modal-backdrop {
-  background-color: rgba(0,0,0,.5);
+  background-color:#000;
+  &.fade {
+    opacity: 0;
+  }
   position: fixed;
   top: 0;
   left: 0;
@@ -657,13 +659,18 @@ input[type=submit].btn {
   bottom: 0;
   z-index: 1000;
 }
+
+.modal-backdrop, .modal-backdrop.fade.in {
+  .opacity(50);
+}
+
 .modal {
   position: fixed;
   top: 50%;
   left: 50%;
   z-index: 2000;
   width: 560px;
-  margin: -280px 0 0 -250px;
+  margin: -250px 0 0 -250px;
   background-color: @white;
   border: 1px solid #999;
   border: 1px solid rgba(0,0,0,.3);
@@ -816,4 +823,16 @@ input[type=submit].btn {
       margin-bottom: 0;
     }
   }
+}
+
+
+// Pattern Animations
+// ------------------
+
+.fade {
+  .transition(opacity .15s linear);
+  opacity: 0;
+  &.in {
+    opacity: 1;
+  }
 }

lib/preboot.less

@@ -152,6 +152,8 @@
 .transition(@transition) {
 	-webkit-transition: @transition;
 	   -moz-transition: @transition;
+ 	    -ms-transition: @transition;
+	     -o-transition: @transition;
 	        transition: @transition;
 }
 

lib/scaffolding.less

@@ -93,6 +93,13 @@ body {
   }
 }
 
+.hide {
+  display: none;
+}
+
+.show {
+  display: block;
+}
 
 // BASE STYLES
 // -----------