]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
resolve conflict in patterns from modals
authorMark Otto <markdotto@gmail.com>
Tue, 28 Jun 2011 17:47:26 +0000 (10:47 -0700)
committerMark Otto <markdotto@gmail.com>
Tue, 28 Jun 2011 17:47:26 +0000 (10:47 -0700)
1  2 
lib/patterns.less

index 79bbefc55fc5b5abf7e17dbac1c8fa21ec2cdc32,7163d45987a004eb35be7a7a61fac120b406522a..d1043adc0533c4d8accc8241960cd6a9f7cf8345
@@@ -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))
 -}
 +}