From 69a7d212798229be2c0e77c4e5af6c4a75fcd22e Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 16 Mar 2016 02:03:21 +0000 Subject: [PATCH] TinyMCE, inline link: - Remove bottom box-shadow from the Apply button so it matches the rest. - Change the tooltip for the cogwheel button to Link options. See #33301. git-svn-id: https://develop.svn.wordpress.org/trunk@37001 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-editor.php | 1 + src/wp-includes/css/editor.css | 20 ++++++++----------- .../js/tinymce/plugins/wplink/plugin.js | 3 +-- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php index 237ce507c5..6a14a4b342 100644 --- a/src/wp-includes/class-wp-editor.php +++ b/src/wp-includes/class-wp-editor.php @@ -1044,6 +1044,7 @@ final class _WP_Editors { 'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar 'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' button in the image toolbar 'Paste URL or type to search' => __( 'Paste URL or type to search' ), // Placeholder for the inline link dialog + 'Link options' => __( 'Link options' ), // Shortcuts help modal 'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ), diff --git a/src/wp-includes/css/editor.css b/src/wp-includes/css/editor.css index 2ef65d0c36..14e5846370 100644 --- a/src/wp-includes/css/editor.css +++ b/src/wp-includes/css/editor.css @@ -484,14 +484,11 @@ div.mce-path { min-width: 0; background: #0085ba; border-color: #0073aa #006799 #006799; - -webkit-box-shadow: 0 1px 0 #006799; - box-shadow: 0 1px 0 #006799; - color: #fff; + -webkit-box-shadow: none; + box-shadow: none; + color: #fff; text-decoration: none; - text-shadow: 0 -1px 1px #006799, - 1px 0 1px #006799, - 0 1px 1px #006799, - -1px 0 1px #006799; + text-shadow: none; } .mce-toolbar .mce-btn-group .mce-btn.mce-primary .mce-ico { @@ -503,13 +500,13 @@ div.mce-path { background: #008ec2; border-color: #006799; color: #fff; + -webkit-box-shadow: 0 1px 0 rgba( 0, 0, 0, 0.2 ); + box-shadow: 0 1px 0 rgba( 0, 0, 0, 0.2 ); } .mce-toolbar .mce-btn-group .mce-btn.mce-primary:focus { - -webkit-box-shadow: 0 1px 0 #0073aa, - 0 0 2px 1px #33b3db; - box-shadow: 0 1px 0 #0073aa, - 0 0 2px 1px #33b3db; + -webkit-box-shadow: 0 0 1px 1px #33b3db; + box-shadow: 0 0 1px 1px #33b3db; } .mce-toolbar .mce-btn-group .mce-btn.mce-primary:active { @@ -517,7 +514,6 @@ div.mce-path { border-color: #006799; -webkit-box-shadow: inset 0 2px 0 #006799; box-shadow: inset 0 2px 0 #006799; - vertical-align: top; } /* mce listbox */ diff --git a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js index c426e80128..ddf2900f7e 100644 --- a/src/wp-includes/js/tinymce/plugins/wplink/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wplink/plugin.js @@ -498,9 +498,8 @@ cmd: 'unlink' } ); - // Advanced, more, options? editor.addButton( 'wp_link_advanced', { - tooltip: 'Advanced', + tooltip: 'Link options', icon: 'dashicon dashicons-admin-generic', onclick: function() { if ( typeof window.wpLink !== 'undefined' ) {