mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-19 11:51:23 +02:00
Code Issues Releases Wiki Activity

change tooltip/popover insert strategy

Browse Source 
remove modal-open class
hopefully resolve z-index headaches
This commit is contained in:
Jacob Thornton
2012-09-24 23:28:38 -07:00
parent 4a2443901f
commit 88b1e44dd6
8 changed files with 10 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
docs/assets/css/bootstrap.css vendored
View File

@@ -4985,22 +4985,6 @@ input[type="submit"].btn.btn-mini {
background-color: #fff; background-color: #fff;
} }
.modal-open .dropdown-menu {
z-index: 2050;
}
.modal-open .dropdown.open {
*z-index: 2050;
}
.modal-open .popover {
z-index: 2060;
}
.modal-open .tooltip {
z-index: 2080;
}
.modal-backdrop { .modal-backdrop {
position: fixed; position: fixed;
top: 0; top: 0;

4
docs/assets/js/bootstrap-modal.js vendored
View File

@@ -49,8 +49,6 @@
if (this.isShown || e.isDefaultPrevented()) return if (this.isShown || e.isDefaultPrevented()) return
$('body').addClass('modal-open')
this.isShown = true this.isShown = true
this.escape() this.escape()
@@ -96,8 +94,6 @@
this.isShown = false this.isShown = false
$('body').removeClass('modal-open')
this.escape() this.escape()
$(document).off('focusin.modal') $(document).off('focusin.modal')

6
docs/assets/js/bootstrap-tooltip.js vendored
View File

@@ -121,7 +121,7 @@
$tip $tip
.remove() .remove()
.css({ top: 0, left: 0, display: 'block' }) .css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body) .insertAfter(this.$element)
pos = this.getPosition(inside) pos = this.getPosition(inside)
@@ -144,7 +144,7 @@
} }
$tip $tip
.css(tp) .offset(tp)
.addClass(placement) .addClass(placement)
.addClass('in') .addClass('in')
} }
@@ -272,4 +272,4 @@
, html: false , html: false
} }
}(window.jQuery); }(window.jQuery);

11
docs/assets/js/bootstrap.js vendored
View File

@@ -773,8 +773,6 @@
if (this.isShown || e.isDefaultPrevented()) return if (this.isShown || e.isDefaultPrevented()) return
$('body').addClass('modal-open')
this.isShown = true this.isShown = true
this.escape() this.escape()
@@ -820,8 +818,6 @@
this.isShown = false this.isShown = false
$('body').removeClass('modal-open')
this.escape() this.escape()
$(document).off('focusin.modal') $(document).off('focusin.modal')
@@ -1083,7 +1079,7 @@
$tip $tip
.remove() .remove()
.css({ top: 0, left: 0, display: 'block' }) .css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body) .insertAfter(this.$element)
pos = this.getPosition(inside) pos = this.getPosition(inside)
@@ -1106,7 +1102,7 @@
} }
$tip $tip
.css(tp) .offset(tp)
.addClass(placement) .addClass(placement)
.addClass('in') .addClass('in')
} }
@@ -1234,8 +1230,7 @@
, html: false , html: false
} }
}(window.jQuery); }(window.jQuery);/* ===========================================================
/* ===========================================================
* bootstrap-popover.js v2.1.2 * bootstrap-popover.js v2.1.2
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
js/bootstrap-modal.js vendored
View File

@@ -49,8 +49,6 @@
if (this.isShown || e.isDefaultPrevented()) return if (this.isShown || e.isDefaultPrevented()) return
$('body').addClass('modal-open')
this.isShown = true this.isShown = true
this.escape() this.escape()
@@ -96,8 +94,6 @@
this.isShown = false this.isShown = false
$('body').removeClass('modal-open')
this.escape() this.escape()
$(document).off('focusin.modal') $(document).off('focusin.modal')

6
js/bootstrap-tooltip.js vendored
View File

@@ -121,7 +121,7 @@
$tip $tip
.remove() .remove()
.css({ top: 0, left: 0, display: 'block' }) .css({ top: 0, left: 0, display: 'block' })
.appendTo(inside ? this.$element : document.body) .insertAfter(this.$element)
pos = this.getPosition(inside) pos = this.getPosition(inside)
@@ -144,7 +144,7 @@
} }
$tip $tip
.css(tp) .offset(tp)
.addClass(placement) .addClass(placement)
.addClass('in') .addClass('in')
} }
@@ -272,4 +272,4 @@
, html: false , html: false
} }
}(window.jQuery); }(window.jQuery);

10
less/modals.less
View File

@@ -2,16 +2,6 @@
// Modals // Modals
// -------------------------------------------------- // --------------------------------------------------
// Recalculate z-index where appropriate,
// but only apply to elements within modal
.modal-open {
.dropdown-menu { z-index: @zindexDropdown + @zindexModal; }
.dropdown.open { *z-index: @zindexDropdown + @zindexModal; }
.popover { z-index: @zindexPopover + @zindexModal; }
.tooltip { z-index: @zindexTooltip + @zindexModal; }
}
// Background // Background
.modal-backdrop { .modal-backdrop {
position: fixed; position: fixed;