Merge branch '2.1.0-wip' of https://github.com/twitter/bootstrap into 2.1.0-wip

3 files changed, 18 insertions, 7 deletions

diff --git a/less/modals.less b/less/modals.less
index 32aab7acd..e515bb796 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -56,6 +56,11 @@
   border-bottom: 1px solid #eee;
   // Close icon
   .close { margin-top: 2px; }
+  // Heading
+  h3 {
+    margin: 0;
+    line-height: 30px;
+  }
 }
 
 // Body (where all modal content resides)
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index b7fd7454f..18c96ee0b 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -84,6 +84,17 @@
     width: auto;
   }
 
+  // Modals
+  .modal {
+    position: fixed;
+    top:   20px;
+    left:  20px;
+    right: 20px;
+    width: auto;
+    margin: 0;
+    &.fade.in { top: auto; }
+  }
+
 }
 
 
@@ -133,13 +144,9 @@
 
   // Modals
   .modal {
-    position: fixed;
     top:   10px;
     left:  10px;
     right: 10px;
-    width: auto;
-    margin: 0;
-    &.fade.in { top: auto; }
   }
   .modal-header .close {
     padding: 10px;
diff --git a/less/utilities.less b/less/utilities.less
index b020e1c1b..5eef70fe7 100644
--- a/less/utilities.less
+++ b/less/utilities.less
@@ -12,12 +12,11 @@
 }
 
 // Toggling content
-// Uses `!important` for proper specifity over things like form controls
 .hide {
-  display: none !important;
+  display: none;
 }
 .show {
-  display: block !important;
+  display: block;
 }
 
 // Visibility