From: Mark Otto <markdotto@gmail.com>
Date: Tue, 28 Jun 2011 17:47:26 +0000 (-0700)
Subject: resolve conflict in patterns from modals
X-Git-Tag: v1.0.0~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80abe21189992f165ff8c7091743bda727adfedd;p=thirdparty%2Fbootstrap.git

resolve conflict in patterns from modals
---

80abe21189992f165ff8c7091743bda727adfedd
diff --cc lib/patterns.less
index 79bbefc55f,7163d45987..d1043adc05
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@@ -491,6 -491,22 +491,23 @@@ div.modal 
    height: 500px;
    margin: -310px 0 0 -250px;
    background-color: @white;
-   .border-radius(6px);
 +  border: 1px solid rgba(0,0,0,.3);
++  .border-radius(6px);
++  .box-shadow(0 2px 6px rgba(0, 0, 0, 0.35))
+   .modal-header {
+     border-bottom:1px solid #eee;
+     padding: 5px 20px;
+     h2 {
+       font-size: 20px;
+       font-weight: 200;
+     }
+     a.close {
+       position: absolute;
+       right: 10px;
+       top: 10px;
+       color: #999;
+       line-height:10px;
+       font-size: 18px;
+     }
+   }
 -  .border-radius(6px);
 -  .box-shadow(0 2px 6px rgba(0, 0, 0, 0.35))
 -}
 +}