diff --git a/bootstrap.css b/bootstrap.css index 3fa776fcbb..354f534b28 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: Wed Dec 21 18:20:33 CST 2011 + * Date: Wed Dec 21 18:38:56 CST 2011 */ html, body { margin: 0; @@ -2466,6 +2466,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { -moz-opacity: 0.8; opacity: 0.8; } +.twipsy.above { + margin-top: -2px; +} +.twipsy.right { + margin-left: 2px; +} +.twipsy.below { + margin-top: 2px; +} +.twipsy.left { + margin-left: -2px; +} .twipsy.above .twipsy-arrow { bottom: 0; left: 50%; @@ -2522,6 +2534,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { display: none; padding: 5px; } +.popover.above { + margin-top: -5px; +} +.popover.right { + margin-left: 5px; +} +.popover.below { + margin-top: 5px; +} +.popover.left { + margin-left: -5px; +} .popover.above .arrow { bottom: 0; left: 50%; diff --git a/bootstrap.min.css b/bootstrap.min.css index 71996816d8..1fb1d4f32f 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -321,13 +321,21 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0; .modal-footer:after{clear:both;} .modal-footer .btn{float:right;margin-left:5px;} .twipsy{position:absolute;z-index:1000;display:block;visibility:visible;padding:5px;font-size:11px;filter:alpha(opacity=0);-moz-opacity:0;opacity:0;}.twipsy.in{filter:alpha(opacity=80);-moz-opacity:0.8;opacity:0.8;} +.twipsy.above{margin-top:-2px;} +.twipsy.right{margin-left:2px;} +.twipsy.below{margin-top:2px;} +.twipsy.left{margin-left:-2px;} .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{max-width:200px;padding:3px 8px;color:white;text-align:center;text-decoration:none;background-color:#000000;-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;display:none;padding:5px;}.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:1000;display:none;padding:5px;}.popover.above{margin-top:-5px;} +.popover.right{margin-left:5px;} +.popover.below{margin-top:5px;} +.popover.left{margin-left:-5px;} +.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/docs/assets/js/application.js b/docs/assets/js/application.js index 255f624bed..724daf9ebd 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -68,7 +68,7 @@ $(function(){ // POSITION STATIC TWIPSIES // ======================== - $(window).bind( 'load resize', function () { + $(window).on('load resize', function () { $(".twipsies a").each(function () { $(this) .twipsy({ diff --git a/docs/javascript.html b/docs/javascript.html index 91fe949101..bf27dd7f17 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -25,7 +25,8 @@ - + + @@ -41,15 +42,13 @@ + + - - + + + + - + + - + + + + - - + + +