scope close icon in modal to modal-header to allow alerts in modals t…

…o use close icons
twbs · Jan 7, 2012 · b6d50c8 · b6d50c8
1 parent e594107
commit b6d50c8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/bootstrap.css b/bootstrap.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: Sat Jan  7 04:15:19 PST 2012
+ * Date: Sat Jan  7 04:20:37 PST 2012
  */
 html, body {
   margin: 0;
@@ -2255,9 +2255,6 @@ i {
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.modal .close {
-  margin-top: 7px;
-}
 .modal.fade {
   -webkit-transition: opacity .3s linear, top .3s ease-out;
   -moz-transition: opacity .3s linear, top .3s ease-out;
@@ -2273,6 +2270,9 @@ i {
   padding: 5px 15px;
   border-bottom: 1px solid #eee;
 }
+.modal-header .close {
+  margin-top: 7px;
+}
 .modal-body {
   padding: 15px;
 }

diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/lib/modals.less b/lib/modals.less
@@ -34,7 +34,6 @@
   .border-radius(6px);
   .box-shadow(0 3px 7px rgba(0,0,0,0.3));
   .background-clip(padding-box);
-  .close { margin-top: 7px; }
   &.fade {
     .transition(e('opacity .3s linear, top .3s ease-out'));
     top: -25%;
@@ -44,6 +43,8 @@
 .modal-header {
   padding: 5px 15px;
   border-bottom: 1px solid #eee;
+  // Close icon
+  .close { margin-top: 7px; }
 }
 .modal-body {
   padding: 15px;