Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-11 02:49:04 +01:00
Code Issues Projects Releases Wiki Activity

TinyMCE, inline link:

Browse Source 
- 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.
Built from https://develop.svn.wordpress.org/trunk@37001


git-svn-id: http://core.svn.wordpress.org/trunk@36968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2016-03-16 02:04:27 +00:00
parent aa8462c59f
commit 571cf91329
9 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/class-wp-editor.php
View File

@ -1044,6 +1044,7 @@ final class _WP_Editors {
'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar 'Remove' => __( 'Remove' ), // Tooltip for the 'remove' button in the image toolbar
'Edit ' => __( 'Edit' ), // Tooltip for the 'edit' 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 '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 // Shortcuts help modal
'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ), 'Keyboard Shortcuts' => __( 'Keyboard Shortcuts' ),

20
wp-includes/css/editor-rtl.css
View File

@ -484,14 +484,11 @@ div.mce-path {
min-width: 0; min-width: 0;
background: #0085ba; background: #0085ba;
border-color: #0073aa #006799 #006799; border-color: #0073aa #006799 #006799;
-webkit-box-shadow: 0 1px 0 #006799; -webkit-box-shadow: none;
box-shadow: 0 1px 0 #006799; box-shadow: none;
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
text-shadow: 0 -1px 1px #006799, text-shadow: none;
-1px 0 1px #006799,
0 1px 1px #006799,
1px 0 1px #006799;
} }
.mce-toolbar .mce-btn-group .mce-btn.mce-primary .mce-ico { .mce-toolbar .mce-btn-group .mce-btn.mce-primary .mce-ico {
@ -503,13 +500,13 @@ div.mce-path {
background: #008ec2; background: #008ec2;
border-color: #006799; border-color: #006799;
color: #fff; 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 { .mce-toolbar .mce-btn-group .mce-btn.mce-primary:focus {
-webkit-box-shadow: 0 1px 0 #0073aa, -webkit-box-shadow: 0 0 1px 1px #33b3db;
0 0 2px 1px #33b3db; box-shadow: 0 0 1px 1px #33b3db;
box-shadow: 0 1px 0 #0073aa,
0 0 2px 1px #33b3db;
} }
.mce-toolbar .mce-btn-group .mce-btn.mce-primary:active { .mce-toolbar .mce-btn-group .mce-btn.mce-primary:active {
@ -517,7 +514,6 @@ div.mce-path {
border-color: #006799; border-color: #006799;
-webkit-box-shadow: inset 0 2px 0 #006799; -webkit-box-shadow: inset 0 2px 0 #006799;
box-shadow: inset 0 2px 0 #006799; box-shadow: inset 0 2px 0 #006799;
vertical-align: top;
} }
/* mce listbox */ /* mce listbox */

2
wp-includes/css/editor-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

20
wp-includes/css/editor.css
View File

@ -484,14 +484,11 @@ div.mce-path {
min-width: 0; min-width: 0;
background: #0085ba; background: #0085ba;
border-color: #0073aa #006799 #006799; border-color: #0073aa #006799 #006799;
-webkit-box-shadow: 0 1px 0 #006799; -webkit-box-shadow: none;
box-shadow: 0 1px 0 #006799; box-shadow: none;
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
text-shadow: 0 -1px 1px #006799, text-shadow: none;
1px 0 1px #006799,
0 1px 1px #006799,
-1px 0 1px #006799;
} }
.mce-toolbar .mce-btn-group .mce-btn.mce-primary .mce-ico { .mce-toolbar .mce-btn-group .mce-btn.mce-primary .mce-ico {
@ -503,13 +500,13 @@ div.mce-path {
background: #008ec2; background: #008ec2;
border-color: #006799; border-color: #006799;
color: #fff; 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 { .mce-toolbar .mce-btn-group .mce-btn.mce-primary:focus {
-webkit-box-shadow: 0 1px 0 #0073aa, -webkit-box-shadow: 0 0 1px 1px #33b3db;
0 0 2px 1px #33b3db; box-shadow: 0 0 1px 1px #33b3db;
box-shadow: 0 1px 0 #0073aa,
0 0 2px 1px #33b3db;
} }
.mce-toolbar .mce-btn-group .mce-btn.mce-primary:active { .mce-toolbar .mce-btn-group .mce-btn.mce-primary:active {
@ -517,7 +514,6 @@ div.mce-path {
border-color: #006799; border-color: #006799;
-webkit-box-shadow: inset 0 2px 0 #006799; -webkit-box-shadow: inset 0 2px 0 #006799;
box-shadow: inset 0 2px 0 #006799; box-shadow: inset 0 2px 0 #006799;
vertical-align: top;
} }
/* mce listbox */ /* mce listbox */

2
wp-includes/css/editor.min.css vendored
View File

File diff suppressed because one or more lines are too long

3
wp-includes/js/tinymce/plugins/wplink/plugin.js
View File

@ -498,9 +498,8 @@
cmd: 'unlink' cmd: 'unlink'
} ); } );
// Advanced, more, options?
editor.addButton( 'wp_link_advanced', { editor.addButton( 'wp_link_advanced', {
tooltip: 'Advanced', tooltip: 'Link options',
icon: 'dashicon dashicons-admin-generic', icon: 'dashicon dashicons-admin-generic',
onclick: function() { onclick: function() {
if ( typeof window.wpLink !== 'undefined' ) { if ( typeof window.wpLink !== 'undefined' ) {

2
wp-includes/js/tinymce/plugins/wplink/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta3-37000'; $wp_version = '4.5-beta3-37001';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.