Set minimum z-index for the TinyMCE modals and adjust the z-index in DFW, see #26952
Built from https://develop.svn.wordpress.org/trunk@27460 git-svn-id: http://core.svn.wordpress.org/trunk@27305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz
parent
c353fa41a2
commit
a8a20f4bb7
|
|
@ -241,7 +241,7 @@
|
|||
top: 30px;
|
||||
bottom: 30px;
|
||||
right: 50%;
|
||||
z-index: 160000;
|
||||
z-index: 100105;
|
||||
}
|
||||
|
||||
.find-box-head {
|
||||
|
|
@ -357,7 +357,7 @@
|
|||
bottom: 0;
|
||||
background: #000;
|
||||
opacity: 0.7;
|
||||
z-index: 159900;
|
||||
z-index: 100100;
|
||||
}
|
||||
|
||||
ul#dismissed-updates {
|
||||
|
|
|
|||
|
|
@ -241,7 +241,7 @@
|
|||
top: 30px;
|
||||
bottom: 30px;
|
||||
left: 50%;
|
||||
z-index: 160000;
|
||||
z-index: 100105;
|
||||
}
|
||||
|
||||
.find-box-head {
|
||||
|
|
@ -357,7 +357,7 @@
|
|||
bottom: 0;
|
||||
background: #000;
|
||||
opacity: 0.7;
|
||||
z-index: 159900;
|
||||
z-index: 100100;
|
||||
}
|
||||
|
||||
ul#dismissed-updates {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -13,7 +13,6 @@
|
|||
/* TinyMCE windows */
|
||||
#mce-modal-block.mce-in {
|
||||
opacity: 0.7;
|
||||
z-index: 159900 !important; /* Overwrite inline style added by TinyMCE. */
|
||||
}
|
||||
|
||||
.mce-window {
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
border-radius: 0;
|
||||
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
|
||||
-webkit-font-smoothing: subpixel-antialiased;
|
||||
}
|
||||
|
||||
|
|
@ -837,7 +835,7 @@ i.mce-caret:before {
|
|||
padding: 2px;
|
||||
position: absolute;
|
||||
display: none;
|
||||
z-index: 155000;
|
||||
z-index: 100020;
|
||||
}
|
||||
|
||||
#wp_editimgbtn,
|
||||
|
|
@ -1474,7 +1472,7 @@ i.mce-caret:before {
|
|||
* =Overlay Styles
|
||||
-------------------------------------------------------------- */
|
||||
.fullscreen-overlay {
|
||||
z-index: 149999;
|
||||
z-index: 100005;
|
||||
display: none;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
|
@ -1502,7 +1500,7 @@ i.mce-caret:before {
|
|||
-------------------------------------------------------------- */
|
||||
|
||||
#wp-fullscreen-body {
|
||||
z-index: 150005;
|
||||
z-index: 100010;
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
|
@ -1514,7 +1512,7 @@ i.mce-caret:before {
|
|||
left: 0;
|
||||
bottom: 30px;
|
||||
top: 60px;
|
||||
z-index: 150010;
|
||||
z-index: 100015;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1580,7 +1578,7 @@ i.mce-caret:before {
|
|||
left: 0;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
z-index: 150050;
|
||||
z-index: 100020;
|
||||
-webkit-transition: opacity 0.4s;
|
||||
transition: opacity 0.4s;
|
||||
}
|
||||
|
|
@ -1719,21 +1717,11 @@ i.mce-caret:before {
|
|||
/* =Thickbox Adjustments
|
||||
-------------------------------------------------------------- */
|
||||
.wp-fullscreen-active #TB_overlay {
|
||||
z-index: 150100;
|
||||
z-index: 100050;
|
||||
}
|
||||
|
||||
.wp-fullscreen-active #TB_window {
|
||||
z-index: 150102;
|
||||
}
|
||||
|
||||
/* =TinyMCE Adjustments
|
||||
-------------------------------------------------------------- */
|
||||
.wp-fullscreen-active #mce-modal-block {
|
||||
z-index: 150100 !important;
|
||||
}
|
||||
|
||||
.wp-fullscreen-active .mce-window {
|
||||
z-index: 150102 !important;
|
||||
z-index: 100051;
|
||||
}
|
||||
|
||||
/* Colors */
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -13,7 +13,6 @@
|
|||
/* TinyMCE windows */
|
||||
#mce-modal-block.mce-in {
|
||||
opacity: 0.7;
|
||||
z-index: 159900 !important; /* Overwrite inline style added by TinyMCE. */
|
||||
}
|
||||
|
||||
.mce-window {
|
||||
|
|
@ -21,7 +20,6 @@
|
|||
border-radius: 0;
|
||||
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
z-index: 160000 !important; /* Overwrite inline style added by TinyMCE. */
|
||||
-webkit-font-smoothing: subpixel-antialiased;
|
||||
}
|
||||
|
||||
|
|
@ -837,7 +835,7 @@ i.mce-caret:before {
|
|||
padding: 2px;
|
||||
position: absolute;
|
||||
display: none;
|
||||
z-index: 155000;
|
||||
z-index: 100020;
|
||||
}
|
||||
|
||||
#wp_editimgbtn,
|
||||
|
|
@ -1474,7 +1472,7 @@ i.mce-caret:before {
|
|||
* =Overlay Styles
|
||||
-------------------------------------------------------------- */
|
||||
.fullscreen-overlay {
|
||||
z-index: 149999;
|
||||
z-index: 100005;
|
||||
display: none;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
|
|
@ -1502,7 +1500,7 @@ i.mce-caret:before {
|
|||
-------------------------------------------------------------- */
|
||||
|
||||
#wp-fullscreen-body {
|
||||
z-index: 150005;
|
||||
z-index: 100010;
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
|
@ -1514,7 +1512,7 @@ i.mce-caret:before {
|
|||
right: 0;
|
||||
bottom: 30px;
|
||||
top: 60px;
|
||||
z-index: 150010;
|
||||
z-index: 100015;
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1580,7 +1578,7 @@ i.mce-caret:before {
|
|||
right: 0;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
z-index: 150050;
|
||||
z-index: 100020;
|
||||
-webkit-transition: opacity 0.4s;
|
||||
transition: opacity 0.4s;
|
||||
}
|
||||
|
|
@ -1719,21 +1717,11 @@ i.mce-caret:before {
|
|||
/* =Thickbox Adjustments
|
||||
-------------------------------------------------------------- */
|
||||
.wp-fullscreen-active #TB_overlay {
|
||||
z-index: 150100;
|
||||
z-index: 100050;
|
||||
}
|
||||
|
||||
.wp-fullscreen-active #TB_window {
|
||||
z-index: 150102;
|
||||
}
|
||||
|
||||
/* =TinyMCE Adjustments
|
||||
-------------------------------------------------------------- */
|
||||
.wp-fullscreen-active #mce-modal-block {
|
||||
z-index: 150100 !important;
|
||||
}
|
||||
|
||||
.wp-fullscreen-active .mce-window {
|
||||
z-index: 150102 !important;
|
||||
z-index: 100051;
|
||||
}
|
||||
|
||||
/* Colors */
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -252,7 +252,7 @@
|
|||
/* WP jQuery Dialog Theme */
|
||||
.wp-dialog {
|
||||
padding: 0;
|
||||
z-index: 300002;
|
||||
z-index: 100102;
|
||||
border: 0;
|
||||
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
|
|
@ -312,7 +312,7 @@
|
|||
}
|
||||
|
||||
.ui-widget-overlay {
|
||||
z-index: 300001;
|
||||
z-index: 100101;
|
||||
background-color: #000;
|
||||
opacity: 0.6;
|
||||
filter: alpha(opacity=60);
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@
|
|||
* http://jquery.org/license
|
||||
*
|
||||
* http://docs.jquery.com/UI/Dialog#theming
|
||||
*/.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:right;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;left:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0 0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:right;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em .4em .5em 1em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:left}.ui-dialog .ui-dialog-buttonpane button{margin:.5em 0 .5em .4em;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;left:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.wp-dialog{padding:0;z-index:300002;border:0;-webkit-box-shadow:0 5px 15px rgba(0,0,0,.7);box-shadow:0 5px 15px rgba(0,0,0,.7);background-color:#f5f5f5}.wp-dialog .ui-dialog-title{display:block;text-align:center;padding:0}.wp-dialog .ui-dialog-titlebar{padding:0 1em;background-color:#444;font-size:13px;line-height:24px;color:#fff}.wp-dialog .ui-dialog-content{padding:0}.wp-dialog .ui-dialog-titlebar-close{cursor:pointer;-webkit-appearance:none;border:0;width:30px;height:20px;top:13px;left:6px;background:0 0}.wp-dialog .ui-dialog-titlebar-close:before{content:'\f158';font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#999;padding-right:12px}.wp-dialog .ui-dialog-titlebar-close:hover:before{color:#2ea2cc}.wp-dialog .ui-dialog-titlebar-close .ui-button-text{display:none}.wp-dialog .ui-dialog-titlebar-close:focus,.wp-dialog .ui-dialog-titlebar-close:hover{background-position:-87px -32px}.ui-widget-overlay{z-index:300001;background-color:#000;opacity:.6;filter:alpha(opacity=60)}
|
||||
*/.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:right;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;left:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0 0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:right;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em .4em .5em 1em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:left}.ui-dialog .ui-dialog-buttonpane button{margin:.5em 0 .5em .4em;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;left:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.wp-dialog{padding:0;z-index:100102;border:0;-webkit-box-shadow:0 5px 15px rgba(0,0,0,.7);box-shadow:0 5px 15px rgba(0,0,0,.7);background-color:#f5f5f5}.wp-dialog .ui-dialog-title{display:block;text-align:center;padding:0}.wp-dialog .ui-dialog-titlebar{padding:0 1em;background-color:#444;font-size:13px;line-height:24px;color:#fff}.wp-dialog .ui-dialog-content{padding:0}.wp-dialog .ui-dialog-titlebar-close{cursor:pointer;-webkit-appearance:none;border:0;width:30px;height:20px;top:13px;left:6px;background:0 0}.wp-dialog .ui-dialog-titlebar-close:before{content:'\f158';font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#999;padding-right:12px}.wp-dialog .ui-dialog-titlebar-close:hover:before{color:#2ea2cc}.wp-dialog .ui-dialog-titlebar-close .ui-button-text{display:none}.wp-dialog .ui-dialog-titlebar-close:focus,.wp-dialog .ui-dialog-titlebar-close:hover{background-position:-87px -32px}.ui-widget-overlay{z-index:100101;background-color:#000;opacity:.6;filter:alpha(opacity=60)}
|
||||
|
|
@ -252,7 +252,7 @@
|
|||
/* WP jQuery Dialog Theme */
|
||||
.wp-dialog {
|
||||
padding: 0;
|
||||
z-index: 300002;
|
||||
z-index: 100102;
|
||||
border: 0;
|
||||
-webkit-box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
box-shadow: 0 5px 15px rgba(0,0,0,0.7);
|
||||
|
|
@ -312,7 +312,7 @@
|
|||
}
|
||||
|
||||
.ui-widget-overlay {
|
||||
z-index: 300001;
|
||||
z-index: 100101;
|
||||
background-color: #000;
|
||||
opacity: 0.6;
|
||||
filter: alpha(opacity=60);
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@
|
|||
* http://jquery.org/license
|
||||
*
|
||||
* http://docs.jquery.com/UI/Dialog#theming
|
||||
*/.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0 0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.wp-dialog{padding:0;z-index:300002;border:0;-webkit-box-shadow:0 5px 15px rgba(0,0,0,.7);box-shadow:0 5px 15px rgba(0,0,0,.7);background-color:#f5f5f5}.wp-dialog .ui-dialog-title{display:block;text-align:center;padding:0}.wp-dialog .ui-dialog-titlebar{padding:0 1em;background-color:#444;font-size:13px;line-height:24px;color:#fff}.wp-dialog .ui-dialog-content{padding:0}.wp-dialog .ui-dialog-titlebar-close{cursor:pointer;-webkit-appearance:none;border:0;width:30px;height:20px;top:13px;right:6px;background:0 0}.wp-dialog .ui-dialog-titlebar-close:before{content:'\f158';font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#999;padding-left:12px}.wp-dialog .ui-dialog-titlebar-close:hover:before{color:#2ea2cc}.wp-dialog .ui-dialog-titlebar-close .ui-button-text{display:none}.wp-dialog .ui-dialog-titlebar-close:focus,.wp-dialog .ui-dialog-titlebar-close:hover{background-position:-87px -32px}.ui-widget-overlay{z-index:300001;background-color:#000;opacity:.6;filter:alpha(opacity=60)}
|
||||
*/.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0 0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.wp-dialog{padding:0;z-index:100102;border:0;-webkit-box-shadow:0 5px 15px rgba(0,0,0,.7);box-shadow:0 5px 15px rgba(0,0,0,.7);background-color:#f5f5f5}.wp-dialog .ui-dialog-title{display:block;text-align:center;padding:0}.wp-dialog .ui-dialog-titlebar{padding:0 1em;background-color:#444;font-size:13px;line-height:24px;color:#fff}.wp-dialog .ui-dialog-content{padding:0}.wp-dialog .ui-dialog-titlebar-close{cursor:pointer;-webkit-appearance:none;border:0;width:30px;height:20px;top:13px;right:6px;background:0 0}.wp-dialog .ui-dialog-titlebar-close:before{content:'\f158';font:400 20px/1 dashicons;speak:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#999;padding-left:12px}.wp-dialog .ui-dialog-titlebar-close:hover:before{color:#2ea2cc}.wp-dialog .ui-dialog-titlebar-close .ui-button-text{display:none}.wp-dialog .ui-dialog-titlebar-close:focus,.wp-dialog .ui-dialog-titlebar-close:hover{background-position:-87px -32px}.ui-widget-overlay{z-index:100101;background-color:#000;opacity:.6;filter:alpha(opacity=60)}
|
||||
|
|
@ -1,4 +1,8 @@
|
|||
/* global tinymce, getUserSetting, setUserSetting, switchEditors */
|
||||
/* global tinymce, getUserSetting, setUserSetting */
|
||||
|
||||
// Set the minimum value for the modals z-index higher than #wpadminbar (100000)
|
||||
tinymce.ui.FloatPanel.zIndex = 100100;
|
||||
|
||||
tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
||||
var DOM = tinymce.DOM, wpAdvButton, modKey, style,
|
||||
last = 0;
|
||||
|
|
@ -279,7 +283,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
var env = tinymce.Env, topx, reset,
|
||||
deltax = 0,
|
||||
bodyClass = ['mceContentBody'], // back-compat for themes that use this in editor-style.css...
|
||||
doc = editor.getDoc();
|
||||
doc = editor.getDoc(),
|
||||
dom = editor.dom;
|
||||
|
||||
if ( editor.getParam( 'directionality' ) === 'rtl' ) {
|
||||
bodyClass.push('rtl');
|
||||
|
|
@ -299,7 +304,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
|
||||
tinymce.each( bodyClass, function( cls ) {
|
||||
if ( cls ) {
|
||||
editor.dom.addClass( doc.body, cls );
|
||||
dom.addClass( doc.body, cls );
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -318,7 +323,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
|
||||
if ( ! ( 'ontouchstart' in window ) ) {
|
||||
// When scrolling with mouse wheel or trackpad inside the editor, don't scroll the parent window
|
||||
editor.dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
|
||||
dom.bind( doc, 'onwheel' in doc ? 'wheel' : 'mousewheel', function( event ) {
|
||||
var delta, top,
|
||||
docElement = doc.documentElement;
|
||||
|
||||
|
|
@ -370,6 +375,13 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
event.preventDefault();
|
||||
});
|
||||
}
|
||||
|
||||
dom.bind( doc, 'dragover', function( event ) {
|
||||
if ( typeof window.jQuery !== 'undefined' ) {
|
||||
// Propagate the event to its container for the parent window to catch.
|
||||
window.jQuery( editor.getContainer() ).trigger( event );
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
// Word count
|
||||
|
|
@ -399,8 +411,8 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
// Keep empty paragraphs :(
|
||||
e.content = e.content.replace( /<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g, '<p> </p>' );
|
||||
|
||||
if ( editor.getParam( 'wpautop', true ) && typeof switchEditors !== 'undefined' ) {
|
||||
e.content = switchEditors.pre_wpautop( e.content );
|
||||
if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) {
|
||||
e.content = window.switchEditors.pre_wpautop( e.content );
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -442,13 +454,6 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
editor.dom.bind( editor.getBody(), 'dragstart', function() {
|
||||
_hideButtons();
|
||||
});
|
||||
|
||||
editor.dom.bind( editor.getWin(), 'dragover', function(e) {
|
||||
if ( typeof window.jQuery !== 'undefined' ) {
|
||||
// Propagate the event to its container for the parent window to catch.
|
||||
jQuery( editor.getContainer() ).trigger(e);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
editor.on( 'BeforeExecCommand', function() {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Binary file not shown.
Loading…
Reference in New Issue