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


git-svn-id: http://core.svn.wordpress.org/trunk@36968 1a063a9b-81f0-0310-95a4-ce76da25c4cd

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' ),

wp-includes/css/editor-rtl.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;
+	-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 */

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;
+	-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 */

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' ) {

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @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.