mirror of
https://github.com/twbs/bootstrap.git
synced 2024-12-01 13:24:25 +01:00
fix z-index issue with modals for popovers,tooltips,and dropdowns
This commit is contained in:
parent
c2c02d104c
commit
12d3c2fe74
12
docs/assets/css/bootstrap.css
vendored
12
docs/assets/css/bootstrap.css
vendored
@ -2238,6 +2238,18 @@ table .span12 {
|
|||||||
.pager .previous a {
|
.pager .previous a {
|
||||||
float: left;
|
float: left;
|
||||||
}
|
}
|
||||||
|
.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: 2070;
|
||||||
|
}
|
||||||
.modal-backdrop {
|
.modal-backdrop {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
@ -69,13 +69,8 @@
|
|||||||
selector: "a[rel=tooltip]"
|
selector: "a[rel=tooltip]"
|
||||||
})
|
})
|
||||||
|
|
||||||
$('.tooltip-test').tooltip({
|
$('.tooltip-test').tooltip()
|
||||||
'z-index': 3000
|
$('.popover-test').popover()
|
||||||
})
|
|
||||||
|
|
||||||
$('.popover-test').popover({
|
|
||||||
'z-index': 3000
|
|
||||||
})
|
|
||||||
|
|
||||||
// popover demo
|
// popover demo
|
||||||
$("a[rel=popover]")
|
$("a[rel=popover]")
|
||||||
|
@ -748,12 +748,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
|
|||||||
<p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
|
<p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>z-index</td>
|
|
||||||
<td>number</td>
|
|
||||||
<td>1020</td>
|
|
||||||
<td>The tooltips z-index value</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="alert alert-info">
|
<div class="alert alert-info">
|
||||||
@ -860,12 +854,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
|
|||||||
<p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
|
<p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>z-index</td>
|
|
||||||
<td>number</td>
|
|
||||||
<td>1010</td>
|
|
||||||
<td>The popovers z-index value</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="alert alert-info">
|
<div class="alert alert-info">
|
||||||
@ -1086,7 +1074,7 @@ $('#my-alert').bind('closed', function () {
|
|||||||
<div class="span9 columns">
|
<div class="span9 columns">
|
||||||
<h2>Example accordion</h2>
|
<h2>Example accordion</h2>
|
||||||
<p>Using the collapse plugin, we built a simple accordion style widget:</p>
|
<p>Using the collapse plugin, we built a simple accordion style widget:</p>
|
||||||
|
|
||||||
<div class="accordion" id="accordion2">
|
<div class="accordion" id="accordion2">
|
||||||
<div class="accordion-group">
|
<div class="accordion-group">
|
||||||
<div class="accordion-heading">
|
<div class="accordion-heading">
|
||||||
@ -1126,7 +1114,7 @@ $('#my-alert').bind('closed', function () {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
<h2>Using bootstrap-collapse.js</h2>
|
<h2>Using bootstrap-collapse.js</h2>
|
||||||
<p>Enable via javascript:</p>
|
<p>Enable via javascript:</p>
|
||||||
|
16
docs/templates/pages/javascript.mustache
vendored
16
docs/templates/pages/javascript.mustache
vendored
@ -683,12 +683,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
|
|||||||
<p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
|
<p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>{{_i}}z-index{{/i}}</td>
|
|
||||||
<td>{{_i}}number{{/i}}</td>
|
|
||||||
<td>1020</td>
|
|
||||||
<td>The tooltips z-index value</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="alert alert-info">
|
<div class="alert alert-info">
|
||||||
@ -795,12 +789,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
|
|||||||
<p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
|
<p>{{_i}}Object structure is: <code>delay: { show: 500, hide: 100 }</code>{{/i}}</p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td>{{_i}}z-index{{/i}}</td>
|
|
||||||
<td>{{_i}}number{{/i}}</td>
|
|
||||||
<td>1010</td>
|
|
||||||
<td>The popovers z-index value</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<div class="alert alert-info">
|
<div class="alert alert-info">
|
||||||
@ -1021,7 +1009,7 @@ $('#my-alert').bind('closed', function () {
|
|||||||
<div class="span9 columns">
|
<div class="span9 columns">
|
||||||
<h2>{{_i}}Example accordion{{/i}}</h2>
|
<h2>{{_i}}Example accordion{{/i}}</h2>
|
||||||
<p>{{_i}}Using the collapse plugin, we built a simple accordion style widget:{{/i}}</p>
|
<p>{{_i}}Using the collapse plugin, we built a simple accordion style widget:{{/i}}</p>
|
||||||
|
|
||||||
<div class="accordion" id="accordion2">
|
<div class="accordion" id="accordion2">
|
||||||
<div class="accordion-group">
|
<div class="accordion-group">
|
||||||
<div class="accordion-heading">
|
<div class="accordion-heading">
|
||||||
@ -1061,7 +1049,7 @@ $('#my-alert').bind('closed', function () {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
<h2>{{_i}}Using bootstrap-collapse.js{{/i}}</h2>
|
<h2>{{_i}}Using bootstrap-collapse.js{{/i}}</h2>
|
||||||
<p>Enable via javascript:</p>
|
<p>Enable via javascript:</p>
|
||||||
|
4
js/bootstrap-modal.js
vendored
4
js/bootstrap-modal.js
vendored
@ -44,6 +44,8 @@
|
|||||||
|
|
||||||
if (this.isShown) return
|
if (this.isShown) return
|
||||||
|
|
||||||
|
$('body').addClass('modal-open')
|
||||||
|
|
||||||
this.isShown = true
|
this.isShown = true
|
||||||
this.$element.trigger('show')
|
this.$element.trigger('show')
|
||||||
|
|
||||||
@ -77,6 +79,8 @@
|
|||||||
var that = this
|
var that = this
|
||||||
this.isShown = false
|
this.isShown = false
|
||||||
|
|
||||||
|
$('body').removeClass('modal-open')
|
||||||
|
|
||||||
escape.call(this)
|
escape.call(this)
|
||||||
|
|
||||||
this.$element
|
this.$element
|
||||||
|
3
js/bootstrap-tooltip.js
vendored
3
js/bootstrap-tooltip.js
vendored
@ -145,8 +145,6 @@
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.options['z-index']) tp['z-index'] = this.options['z-index']
|
|
||||||
|
|
||||||
$tip
|
$tip
|
||||||
.css(tp)
|
.css(tp)
|
||||||
.addClass(placement)
|
.addClass(placement)
|
||||||
@ -267,7 +265,6 @@
|
|||||||
, trigger: 'hover'
|
, trigger: 'hover'
|
||||||
, title: ''
|
, title: ''
|
||||||
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
||||||
, 'z-index': false
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery )
|
||||||
|
@ -1,6 +1,13 @@
|
|||||||
// MODALS
|
// MODALS
|
||||||
// ------
|
// ------
|
||||||
|
|
||||||
|
.modal-open {
|
||||||
|
.dropdown-menu { z-index: @zindexDropdown + @zindexModal }
|
||||||
|
.dropdown.open { *z-index: @zindexDropdown + @zindexModal }
|
||||||
|
.popover { z-index: @zindexPopover + @zindexModal }
|
||||||
|
.tooltip { z-index: @zindexTooltip + @zindexModal }
|
||||||
|
}
|
||||||
|
|
||||||
.modal-backdrop {
|
.modal-backdrop {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user