From: Jacob Thornton Date: Mon, 29 Aug 2011 00:45:57 +0000 (-0700) Subject: blah X-Git-Tag: v1.3.0~86^2^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=484ed088fc51666ac0f319e9cb66a567722e7113;p=thirdparty%2Fbootstrap.git blah --- diff --git a/bootstrap-1.1.1.css b/bootstrap-1.1.1.css index c4738ba687..ec9827edc7 100644 --- a/bootstrap-1.1.1.css +++ b/bootstrap-1.1.1.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 Aug 28 17:41:37 PDT 2011 + * Date: Sun Aug 28 17:45:46 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). @@ -1683,7 +1683,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000'));*/ background-color: #000; - opacity: .5; position: fixed; top: 0; left: 0; @@ -1694,8 +1693,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { .modal-backdrop.fade { opacity: 0; } -.modal-backdrop.fade.in { - opacity: .5; +.modal-backdrop, .modal-backdrop.fade.in { + filter: alpha(opacity=50); + -khtml-opacity: 0.5; + -moz-opacity: 0.5; + opacity: 0.5; } .modal { position: fixed; diff --git a/bootstrap-1.1.1.min.css b/bootstrap-1.1.1.min.css index fd88dc93ec..e9e53d5ff9 100644 --- a/bootstrap-1.1.1.min.css +++ b/bootstrap-1.1.1.min.css @@ -226,7 +226,8 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .pagination ul li.disabled a,.pagination ul li.disabled a:hover{background-color:transparent;color:#bfbfbf;} .pagination ul li.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);} -.modal-backdrop{background-color:#000;opacity:.5;position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}.modal-backdrop.fade{opacity:0;}.modal-backdrop.fade.in{opacity:.5;} +.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,.modal-backdrop.fade.in{filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;} .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 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 .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal .modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} .modal .modal-body{padding:20px;} .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;margin-bottom:18px;margin-bottom:0;}.modal .modal-footer:before,.modal .modal-footer:after{display:table;content:"";} diff --git a/lib/patterns.less b/lib/patterns.less index e3d4ba1069..0b286d626d 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -581,12 +581,8 @@ input[type=submit].btn { /* background-color: rgba(0,0,0,.5); filter: e(%("progid:DXImageTransform.Microsoft.gradient(GradientType=0,startColorstr=%d,endColorstr=%d)", '#aa000000', '#aa000000'));*/ background-color:#000; - opacity: .5; &.fade { opacity: 0; - &.in { - opacity: .5; - } } position: fixed; top: 0; @@ -595,6 +591,10 @@ input[type=submit].btn { bottom: 0; z-index: 1000; } +.modal-backdrop, .modal-backdrop.fade.in { + .opacity(50); +} + .modal { position: fixed; top: 50%;