aboutsummaryrefslogtreecommitdiff
path: root/lib/patterns.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-06-28 10:47:26 -0700
committerMark Otto <[email protected]>2011-06-28 10:47:26 -0700
commit80abe21189992f165ff8c7091743bda727adfedd (patch)
treee46bd1afca3c355e235ca31a96437cd7707a46bb /lib/patterns.less
parent68f421eac7d71d3815b394efbefe2abafc30c6a5 (diff)
parente33808447e13f340755861f389d7b4db4557f10c (diff)
downloadbootstrap-80abe21189992f165ff8c7091743bda727adfedd.tar.xz
bootstrap-80abe21189992f165ff8c7091743bda727adfedd.zip
resolve conflict in patterns from modals
Diffstat (limited to 'lib/patterns.less')
-rw-r--r--lib/patterns.less19
1 files changed, 18 insertions, 1 deletions
diff --git a/lib/patterns.less b/lib/patterns.less
index 79bbefc55..d1043adc0 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -491,6 +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;
+ }
+ }
}