Fix internal linking dialog conflicts with jQuery UI 1.10.x. Syncs jQuery UI CSS styles.

Remaining issue will be fixed in 1.10.2 final.
props ocean90.
see #23370.



git-svn-id: http://core.svn.wordpress.org/trunk@23515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2013-02-28 17:54:00 +00:00
parent 3eff7fa98f
commit a41d51a765
3 changed files with 466 additions and 130 deletions

View File

@ -1367,12 +1367,12 @@ html[dir="rtl"] .wp-switch-editor {
float: right; float: right;
} }
/* /*!
* Based on: * jQuery UI CSS Framework 1.10.1
* jQuery UI CSS Framework @VERSION * http://jqueryui.com
* *
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Theming/API * http://docs.jquery.com/UI/Theming/API
@ -1380,78 +1380,249 @@ html[dir="rtl"] .wp-switch-editor {
/* Layout helpers /* Layout helpers
----------------------------------*/ ----------------------------------*/
.ui-helper-hidden { display: none; } .ui-helper-hidden {
.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } display: none;
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } }
.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } .ui-helper-hidden-accessible {
.ui-helper-clearfix { display: inline-block; } border: 0;
/* required comment for clearfix to work in Opera \*/ clip: rect(0 0 0 0);
* html .ui-helper-clearfix { height:1%; } height: 1px;
.ui-helper-clearfix { display:block; } margin: -1px;
/* end clearfix */ overflow: hidden;
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } padding: 0;
position: absolute;
width: 1px;
}
.ui-helper-reset {
margin: 0;
padding: 0;
border: 0;
outline: 0;
line-height: 1.3;
text-decoration: none;
font-size: 100%;
list-style: none;
}
.ui-helper-clearfix:before,
.ui-helper-clearfix:after {
content: "";
display: table;
border-collapse: collapse;
}
.ui-helper-clearfix:after {
clear: both;
}
.ui-helper-clearfix {
min-height: 0; /* support: IE7 */
}
.ui-helper-zfix {
width: 100%;
height: 100%;
top: 0;
left: 0;
position: absolute;
opacity: 0;
filter:Alpha(Opacity=0);
}
.ui-front {
z-index: 100;
}
/* Interaction Cues /* Interaction Cues
----------------------------------*/ ----------------------------------*/
.ui-state-disabled { cursor: default !important; } .ui-state-disabled {
cursor: default !important;
}
/* Icons /* Icons
----------------------------------*/ ----------------------------------*/
/* states and images */ /* states and images */
.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } .ui-icon {
display: block;
text-indent: -99999px;
overflow: hidden;
background-repeat: no-repeat;
}
/* Misc visuals /* Misc visuals
----------------------------------*/ ----------------------------------*/
/* Overlays */ /* Overlays */
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } .ui-widget-overlay {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
/*
* jQuery UI Resizable /*!
* jQuery UI Resizable 1.10.1
* http://jqueryui.com
* *
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Resizable#theming * http://docs.jquery.com/UI/Resizable#theming
*/ */
.ui-resizable { position: relative;} .ui-resizable {
.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} position: relative;
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } }
.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } .ui-resizable-handle {
.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } position: absolute;
.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } font-size: 0.1px;
.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } display: block;
.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } }
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } .ui-resizable-disabled .ui-resizable-handle,
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } .ui-resizable-autohide .ui-resizable-handle {
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;} display: none;
}
.ui-resizable-n {
cursor: n-resize;
height: 7px;
width: 100%;
top: -5px;
left: 0;
}
.ui-resizable-s {
cursor: s-resize;
height: 7px;
width: 100%;
bottom: -5px;
left: 0;
}
.ui-resizable-e {
cursor: e-resize;
width: 7px;
right: -5px;
top: 0;
height: 100%;
}
.ui-resizable-w {
cursor: w-resize;
width: 7px;
left: -5px;
top: 0;
height: 100%;
}
.ui-resizable-se {
cursor: se-resize;
width: 12px;
height: 12px;
right: 1px;
bottom: 1px;
}
.ui-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: -5px;
bottom: -5px;
}
.ui-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 9px;
left: -5px;
top: -5px;
}
.ui-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 9px;
right: -5px;
top: -5px;
}
/* /*!
* jQuery UI Dialog * jQuery UI Dialog 1.10.1
* http://jqueryui.com
* *
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Dialog#theming * http://docs.jquery.com/UI/Dialog#theming
*/ */
.wp-dialog { position: absolute; width: 300px; overflow: hidden; } .ui-dialog {
.wp-dialog .ui-dialog-titlebar { position: relative; } position: absolute;
.wp-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } top: 0;
.wp-dialog .ui-dialog-content { position: relative; border: 0; padding: 0; background: none; overflow: auto; zoom: 1; } left: 0;
.wp-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } padding: .2em;
.wp-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } outline: 0;
.wp-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } }
.wp-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-dialog .ui-dialog-titlebar {
.ui-draggable .ui-dialog-titlebar { cursor: move; } 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: none;
overflow: auto;
}
.ui-dialog .ui-dialog-buttonpane {
text-align: left;
border-width: 1px 0 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 jQuery Dialog Theme */ /* WP jQuery Dialog Theme */
.wp-dialog { .wp-dialog {
padding: 0;
z-index: 300002;
border: 1px solid #999; border: 1px solid #999;
-webkit-box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 ); -webkit-box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 );
box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 ); box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 );
background-color: #f5f5f5;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
} }
.wp-dialog .ui-dialog-title { .wp-dialog .ui-dialog-title {
@ -1467,36 +1638,29 @@ html[dir="rtl"] .wp-switch-editor {
font-size: 11px; font-size: 11px;
line-height: 18px; line-height: 18px;
color: #e5e5e5; color: #e5e5e5;
}
.wp-dialog {
background-color: #fff;
-webkit-border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
border-top-left-radius: 4px;
border-top-right-radius: 4px;
}
.wp-dialog .ui-dialog-titlebar {
-webkit-border-top-left-radius: 3px; -webkit-border-top-left-radius: 3px;
-webkit-border-top-right-radius: 3px;
border-top-left-radius: 3px; border-top-left-radius: 3px;
-webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px; border-top-right-radius: 3px;
} }
.wp-dialog .ui-dialog-titlebar-close { .wp-dialog .ui-dialog-content {
position: absolute;
width: 29px;
height: 16px;
top: 2px;
right: 6px;
background: url('../js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif') no-repeat -87px -16px;
padding: 0; padding: 0;
} }
.rtl .wp-dialog .ui-dialog-titlebar-close { .wp-dialog .ui-dialog-titlebar-close {
right: auto; cursor: pointer;
left: 6px; -webkit-appearance: none;
border: 0;
width: 29px;
height: 16px;
top: 13px;
right: 6px;
background: url('../js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif') no-repeat -87px -16px;
}
.wp-dialog .ui-dialog-titlebar-close .ui-button-text {
display: none;
} }
.wp-dialog .ui-dialog-titlebar-close:hover, .wp-dialog .ui-dialog-titlebar-close:hover,
@ -1505,11 +1669,17 @@ html[dir="rtl"] .wp-switch-editor {
} }
.ui-widget-overlay { .ui-widget-overlay {
z-index: 300001;
background-color: #000; background-color: #000;
opacity: 0.6; opacity: 0.6;
filter: alpha(opacity=60); filter: alpha(opacity=60);
} }
.rtl .wp-dialog .ui-dialog-titlebar-close {
right: auto;
left: 6px;
}
/* /*
RTL RTL
*/ */
@ -2113,4 +2283,3 @@ RTL
background-size: 19px 69px; background-size: 19px 69px;
} }
} }

View File

@ -1,8 +1,9 @@
/* /*!
* jQuery UI CSS Framework @VERSION * jQuery UI CSS Framework 1.10.1
* http://jqueryui.com
* *
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Theming/API * http://docs.jquery.com/UI/Theming/API
@ -10,81 +11,249 @@
/* Layout helpers /* Layout helpers
----------------------------------*/ ----------------------------------*/
.ui-helper-hidden { display: none; } .ui-helper-hidden {
.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } display: none;
.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } }
.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } .ui-helper-hidden-accessible {
.ui-helper-clearfix { display: inline-block; } border: 0;
/* required comment for clearfix to work in Opera \*/ clip: rect(0 0 0 0);
* html .ui-helper-clearfix { height:1%; } height: 1px;
.ui-helper-clearfix { display:block; } margin: -1px;
/* end clearfix */ overflow: hidden;
.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } padding: 0;
position: absolute;
width: 1px;
}
.ui-helper-reset {
margin: 0;
padding: 0;
border: 0;
outline: 0;
line-height: 1.3;
text-decoration: none;
font-size: 100%;
list-style: none;
}
.ui-helper-clearfix:before,
.ui-helper-clearfix:after {
content: "";
display: table;
border-collapse: collapse;
}
.ui-helper-clearfix:after {
clear: both;
}
.ui-helper-clearfix {
min-height: 0; /* support: IE7 */
}
.ui-helper-zfix {
width: 100%;
height: 100%;
top: 0;
left: 0;
position: absolute;
opacity: 0;
filter:Alpha(Opacity=0);
}
.ui-front {
z-index: 100;
}
/* Interaction Cues /* Interaction Cues
----------------------------------*/ ----------------------------------*/
.ui-state-disabled { cursor: default !important; } .ui-state-disabled {
cursor: default !important;
}
/* Icons /* Icons
----------------------------------*/ ----------------------------------*/
/* states and images */ /* states and images */
.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } .ui-icon {
display: block;
text-indent: -99999px;
overflow: hidden;
background-repeat: no-repeat;
}
/* Misc visuals /* Misc visuals
----------------------------------*/ ----------------------------------*/
/* Overlays */ /* Overlays */
.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } .ui-widget-overlay {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
/*
* jQuery UI Resizable /*!
* jQuery UI Resizable 1.10.1
* http://jqueryui.com
* *
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Resizable#theming * http://docs.jquery.com/UI/Resizable#theming
*/ */
.ui-resizable { position: relative;} .ui-resizable {
.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} position: relative;
.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } }
.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } .ui-resizable-handle {
.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } position: absolute;
.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } font-size: 0.1px;
.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } display: block;
.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } }
.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } .ui-resizable-disabled .ui-resizable-handle,
.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } .ui-resizable-autohide .ui-resizable-handle {
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;} display: none;
}
.ui-resizable-n {
cursor: n-resize;
height: 7px;
width: 100%;
top: -5px;
left: 0;
}
.ui-resizable-s {
cursor: s-resize;
height: 7px;
width: 100%;
bottom: -5px;
left: 0;
}
.ui-resizable-e {
cursor: e-resize;
width: 7px;
right: -5px;
top: 0;
height: 100%;
}
.ui-resizable-w {
cursor: w-resize;
width: 7px;
left: -5px;
top: 0;
height: 100%;
}
.ui-resizable-se {
cursor: se-resize;
width: 12px;
height: 12px;
right: 1px;
bottom: 1px;
}
.ui-resizable-sw {
cursor: sw-resize;
width: 9px;
height: 9px;
left: -5px;
bottom: -5px;
}
.ui-resizable-nw {
cursor: nw-resize;
width: 9px;
height: 9px;
left: -5px;
top: -5px;
}
.ui-resizable-ne {
cursor: ne-resize;
width: 9px;
height: 9px;
right: -5px;
top: -5px;
}
/* /*!
* jQuery UI Dialog * jQuery UI Dialog 1.10.1
* http://jqueryui.com
* *
* Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) * Copyright 2013 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses. * Released under the MIT license.
* http://jquery.org/license * http://jquery.org/license
* *
* http://docs.jquery.com/UI/Dialog#theming * http://docs.jquery.com/UI/Dialog#theming
*/ */
.wp-dialog { position: absolute; width: 300px; overflow: hidden; } .ui-dialog {
.wp-dialog .ui-dialog-titlebar { position: relative; } position: absolute;
.wp-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } top: 0;
.wp-dialog .ui-dialog-content { position: relative; border: 0; padding: 0; background: none; overflow: auto; zoom: 1; } left: 0;
.wp-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } padding: .2em;
.wp-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } outline: 0;
.wp-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } }
.wp-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } .ui-dialog .ui-dialog-titlebar {
.ui-draggable .ui-dialog-titlebar { cursor: move; } 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: none;
overflow: auto;
}
.ui-dialog .ui-dialog-buttonpane {
text-align: left;
border-width: 1px 0 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 jQuery Dialog Theme */ /* WP jQuery Dialog Theme */
.wp-dialog { .wp-dialog {
padding: 0;
z-index: 300002;
border: 1px solid #999; border: 1px solid #999;
-webkit-box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 ); -webkit-box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 );
box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 ); box-shadow: 0px 0px 16px rgba( 0,0,0,0.3 );
background-color: #f5f5f5;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
} }
.wp-dialog .ui-dialog-title { .wp-dialog .ui-dialog-title {
@ -100,31 +269,29 @@
font-size: 11px; font-size: 11px;
line-height: 18px; line-height: 18px;
color: #e5e5e5; color: #e5e5e5;
}
.wp-dialog {
background-color: #f5f5f5;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
}
.wp-dialog .ui-dialog-titlebar {
-webkit-border-top-left-radius: 3px; -webkit-border-top-left-radius: 3px;
border-top-left-radius: 3px; border-top-left-radius: 3px;
-webkit-border-top-right-radius: 3px; -webkit-border-top-right-radius: 3px;
border-top-right-radius: 3px; border-top-right-radius: 3px;
} }
.wp-dialog .ui-dialog-content {
padding: 0;
}
.wp-dialog .ui-dialog-titlebar-close { .wp-dialog .ui-dialog-titlebar-close {
position: absolute; cursor: pointer;
-webkit-appearance: none;
border: 0;
width: 29px; width: 29px;
height: 16px; height: 16px;
top: 2px; top: 13px;
right: 6px; right: 6px;
background: url('../js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif') no-repeat -87px -16px; background: url('../js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif') no-repeat -87px -16px;
padding: 0; }
.wp-dialog .ui-dialog-titlebar-close .ui-button-text {
display: none;
} }
.wp-dialog .ui-dialog-titlebar-close:hover, .wp-dialog .ui-dialog-titlebar-close:hover,
@ -133,6 +300,7 @@
} }
.ui-widget-overlay { .ui-widget-overlay {
z-index: 300001;
background-color: #000; background-color: #000;
opacity: 0.6; opacity: 0.6;
filter: alpha(opacity=60); filter: alpha(opacity=60);

View File

@ -71,8 +71,7 @@ var wpLink;
width: 480, width: 480,
height: 'auto', height: 'auto',
modal: true, modal: true,
dialogClass: 'wp-dialog', dialogClass: 'wp-dialog'
zIndex: 300000
}); });
} }