Media: zIndex peace was only temporary.

Revert [22611] in favor of using plupload's `container` setting. Turns out, plupload's flash shim is forced to the exact same index as the admin bar, so balancing the two is better solved by nesting the shim.

see #22441, #22446, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-16 10:30:36 +00:00
parent eeeaf4d016
commit b57d3ff767
2 changed files with 5 additions and 4 deletions

View File

@ -24,7 +24,7 @@
left: 40px;
right: 40px;
bottom: 40px;
z-index: 50000;
z-index: 125000;
}
.media-modal-backdrop {
@ -35,7 +35,7 @@
bottom: 0;
background: #000;
opacity: 0.8;
z-index: 40000;
z-index: 120000;
}
.media-modal-backdrop div {
@ -671,7 +671,7 @@
bottom: 0;
background: rgba( 0, 86, 132, 0.9 );
z-index: 200000;
z-index: 250000;
display: none;
text-align: center;
opacity: 0;

View File

@ -659,7 +659,8 @@
if ( this.options.uploader ) {
this.uploader = new media.view.UploaderWindow({
uploader: {
dropzone: this.modal ? this.modal.$el : this.$el
dropzone: this.modal ? this.modal.$el : this.$el,
container: this.$el
}
});
}