Merge pull request twbs#850 from sferik/scrollable_modal

Make modal windows scrollable
rvagg · Dec 26, 2011 · 1c7c5f7 · 1c7c5f7
2 parents e71a532 + 7fbb366
commit 1c7c5f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 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: Wed Dec  7 20:14:59 EST 2011
+ * Date: Sun Dec 25 20:18:31 PST 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -2177,6 +2177,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   top: 50%;
   left: 50%;
   z-index: 11000;
+  max-height: 500px;
+  overflow: auto;
   width: 560px;
   margin: -250px 0 0 -280px;
   background-color: #ffffff;

diff --git a/bootstrap.min.css b/bootstrap.min.css
diff --git a/lib/patterns.less b/lib/patterns.less
@@ -834,6 +834,8 @@ input[type=submit].btn {
   top: 50%;
   left: 50%;
   z-index: 11000;
+  max-height: 500px;
+  overflow: auto;
   width: 560px;
   margin: -250px 0 0 -280px;
   background-color: @white;