From bc41c58472b5c8d04f151bd1c847e3da76125dc2 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Sep 2011 13:31:58 -0700 Subject: [PATCH 1/2] make modals cover topbars --- bootstrap-1.3.0.css | 4 ++-- bootstrap-1.3.0.min.css | 2 +- docs/index.html | 2 +- lib/patterns.less | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index e4b74d6fe2..be25c628ea 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.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: Sun Sep 11 22:02:16 PDT 2011 + * Date: Mon Sep 12 13:31:51 PDT 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). @@ -2046,7 +2046,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { left: 0; right: 0; bottom: 0; - z-index: 1000; + z-index: 10000; } .modal-backdrop.fade { opacity: 0; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index adbcc16b48..dd5378ec70 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -292,7 +292,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;} .pagination .next a{border:0;} .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} -.modal-backdrop{background-color:#000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}.modal-backdrop.fade{opacity:0;} +.modal-backdrop{background-color:#000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-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;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} diff --git a/docs/index.html b/docs/index.html index 114e02fd6b..08ce0033f3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -99,7 +99,7 @@
Fork on GitHub

Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.

Bootstrap on GitHub »

-

Currently v1.2.0

+

Currently v1.3.0

diff --git a/lib/patterns.less b/lib/patterns.less index 46c1b1cbd5..68e9b3190d 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -736,7 +736,7 @@ input[type=submit].btn { left: 0; right: 0; bottom: 0; - z-index: 1000; + z-index: 10000; } .modal-backdrop, .modal-backdrop.fade.in { From 7af4a4cfa1684eaf0a3d3e822f5a1171424b4295 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 Sep 2011 13:32:46 -0700 Subject: [PATCH 2/2] really make modals cover topbars and not cover the modal itself --- bootstrap-1.3.0.css | 4 ++-- bootstrap-1.3.0.min.css | 2 +- lib/patterns.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css index be25c628ea..4a4e0dfaab 100644 --- a/bootstrap-1.3.0.css +++ b/bootstrap-1.3.0.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: Mon Sep 12 13:31:51 PDT 2011 + * Date: Mon Sep 12 13:32:28 PDT 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). @@ -2061,7 +2061,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { position: fixed; top: 50%; left: 50%; - z-index: 2000; + z-index: 11000; width: 560px; margin: -250px 0 0 -250px; background-color: #ffffff; diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css index dd5378ec70..43d1c5684d 100644 --- a/bootstrap-1.3.0.min.css +++ b/bootstrap-1.3.0.min.css @@ -294,7 +294,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);} .modal-backdrop{background-color:#000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;} .modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} -.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal .close{margin-top:7px;} +.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-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;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;} .modal.fade.in{top:50%;} .modal-header{border-bottom:1px solid #eee;padding:5px 15px;} diff --git a/lib/patterns.less b/lib/patterns.less index 68e9b3190d..82b7790b72 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -747,7 +747,7 @@ input[type=submit].btn { position: fixed; top: 50%; left: 50%; - z-index: 2000; + z-index: 11000; width: 560px; margin: -250px 0 0 -250px; background-color: @white;