Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
12d3c2fe
Commit
12d3c2fe
authored
Jan 28, 2012
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix z-index issue with modals for popovers,tooltips,and dropdowns
parent
c2c02d10
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
38 deletions
+29
-38
docs/assets/css/bootstrap.css
docs/assets/css/bootstrap.css
+12
-0
docs/assets/js/application.js
docs/assets/js/application.js
+2
-7
docs/javascript.html
docs/javascript.html
+2
-14
docs/templates/pages/javascript.mustache
docs/templates/pages/javascript.mustache
+2
-14
js/bootstrap-modal.js
js/bootstrap-modal.js
+4
-0
js/bootstrap-tooltip.js
js/bootstrap-tooltip.js
+0
-3
less/modals.less
less/modals.less
+7
-0
No files found.
docs/assets/css/bootstrap.css
View file @
12d3c2fe
...
@@ -2238,6 +2238,18 @@ table .span12 {
...
@@ -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
;
...
...
docs/assets/js/application.js
View file @
12d3c2fe
...
@@ -69,13 +69,8 @@
...
@@ -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]
"
)
...
...
docs/javascript.html
View file @
12d3c2fe
...
@@ -748,12 +748,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
...
@@ -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) {
...
@@ -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 () {
...
@@ -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 () {
...
@@ -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>
...
...
docs/templates/pages/javascript.mustache
View file @
12d3c2fe
...
@@ -683,12 +683,6 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
...
@@ -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) {
...
@@ -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 () {
...
@@ -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 () {
...
@@ -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>
...
...
js/bootstrap-modal.js
View file @
12d3c2fe
...
@@ -44,6 +44,8 @@
...
@@ -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 @@
...
@@ -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
...
...
js/bootstrap-tooltip.js
View file @
12d3c2fe
...
@@ -145,8 +145,6 @@
...
@@ -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 @@
...
@@ -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
)
less/modals.less
View file @
12d3c2fe
// 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;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment