From: Mark Otto Date: Sun, 21 Aug 2011 06:47:23 +0000 (-0700) Subject: fix bg-clip property's old value, move from padding to padding-box X-Git-Tag: v1.1.0~13^2~3^2~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79bdb80543702348976a9cbd0c0b9bd2472fb148;p=thirdparty%2Fbootstrap.git fix bg-clip property's old value, move from padding to padding-box --- diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index c690088efe..ae25e3066e 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.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: Sat Aug 20 23:43:58 PDT 2011 + * Date: Sat Aug 20 23:46:35 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). @@ -1599,9 +1599,9 @@ div.modal { -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; - -moz-background-clip: padding; - background-clip: padding; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } div.modal .modal-header { border-bottom: 1px solid #eee; @@ -1773,9 +1773,9 @@ div.twipsy .twipsy-arrow { -webkit-border-radius: 0 0 3px 3px; -moz-border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px; - -webkit-background-clip: padding; - -moz-background-clip: padding; - background-clip: padding; + -webkit-background-clip: padding-box; + -moz-background-clip: padding-box; + background-clip: padding-box; } .popover .content p, .popover .content ul, .popover .content ol { margin-bottom: 0; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index f3538e0ddc..1c4eec5e64 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -202,7 +202,7 @@ div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background div.pagination ul li.next a,div.pagination ul li:last-child 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);} div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} -div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-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;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} +div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-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;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} div.modal .modal-body{padding:20px;} div.modal .modal-footer{background-color:#f5f5f5;padding:14px 20px 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;}div.modal .modal-footer:before,div.modal .modal-footer:after{display:table;content:"";} div.modal .modal-footer:after{clear:both;} @@ -220,4 +220,4 @@ div.twipsy .twipsy-arrow{position:absolute;width:0;height:0;} .popover .arrow{position:absolute;width:0;height:0;} .popover .inner{background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-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);} .popover .title{background:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;} -.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} +.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;} diff --git a/lib/patterns.less b/lib/patterns.less index 69d747463c..0a2ae01580 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -510,7 +510,7 @@ div.modal { border: 1px solid rgba(0,0,0,.3); .border-radius(6px); .box-shadow(0 3px 7px rgba(0,0,0,0.3)); - .background-clip(padding); + .background-clip(padding-box); .modal-header { border-bottom: 1px solid #eee; padding: 5px 20px; @@ -649,7 +649,7 @@ div.twipsy { background-color: @white; padding: 14px; .border-radius(0 0 3px 3px); - .background-clip(padding); + .background-clip(padding-box); p, ul, ol { margin-bottom: 0; }