From aa3a8af2d082423e7cede05874b5a56b642ae1b7 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 8 Oct 2011 00:16:21 -0700 Subject: [PATCH] place popovers and twipsies above modals for use there --- bootstrap.css | 6 +++--- bootstrap.min.css | 4 ++-- lib/patterns.less | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 4eca09e693..819bda3f50 100644 --- 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 Oct 8 00:14:02 PDT 2011 + * Date: Sat Oct 8 00:16:12 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). @@ -2195,7 +2195,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { visibility: visible; padding: 5px; font-size: 11px; - z-index: 1000; + z-index: 12000; filter: alpha(opacity=80); -khtml-opacity: 0.8; -moz-opacity: 0.8; @@ -2259,7 +2259,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { position: absolute; top: 0; left: 0; - z-index: 1000; + z-index: 12000; padding: 5px; display: none; } diff --git a/bootstrap.min.css b/bootstrap.min.css index 683f4b789a..bdd6389788 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -324,14 +324,14 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;} .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;} -.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} +.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:12000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;} .twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} .twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .twipsy-inner{padding:3px 8px;background-color:#000000;color:white;text-align:center;max-width:200px;text-decoration:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .twipsy-arrow{position:absolute;width:0;height:0;} -.popover{position:absolute;top:0;left:0;z-index:1000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} +.popover{position:absolute;top:0;left:0;z-index:12000;padding:5px;display:none;}.popover.above .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;} .popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;} .popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;} .popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;} diff --git a/lib/patterns.less b/lib/patterns.less index 117783059c..da6b0df3bd 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -894,7 +894,7 @@ input[type=submit].btn { visibility: visible; padding: 5px; font-size: 11px; - z-index: 1000; + z-index: 12000; .opacity(80); &.fade.in { .opacity(80); @@ -927,7 +927,7 @@ input[type=submit].btn { position: absolute; top: 0; left: 0; - z-index: 1000; + z-index: 12000; padding: 5px; display: none; &.above .arrow { #popoverArrow > .above(); }