Merge branch 'trunk' into html-api/add-html-templating

Author: sirreal

Gruntfile.js

@@ -1837,6 +1837,7 @@ module.exports = function(grunt) {
 		'clean:js',
 		'build:webpack',
 		'copy:js',
+		'copy-vendor-scripts',
 		'file_append',
 		'uglify:all',
 		'concat:tinymce',
@@ -2133,7 +2134,6 @@ module.exports = function(grunt) {
 				'build:css',
 				'build:codemirror',
 				'build:gutenberg',
-				'copy-vendor-scripts',
 				'build:certificates'
 			] );
 		} else {
@@ -2145,7 +2145,6 @@ module.exports = function(grunt) {
 				'build:css',
 				'build:codemirror',
 				'build:gutenberg',
-				'copy-vendor-scripts',
 				'replace:source-maps',
 				'verify:build'
 			] );

src/wp-admin/css/color-picker.css

@@ -10,7 +10,7 @@
 
 /* Needs higher specificity to override `.wp-core-ui .button`. */
 .wp-picker-container .wp-color-result.button {
-	min-height: 30px;
+	min-height: 32px;
 	margin: 0 6px 6px 0;
 	padding: 0 0 0 30px;
 	font-size: 11px;
@@ -22,7 +22,7 @@
 	border-left: 1px solid #c3c4c7;
 	color: #50575e;
 	display: block;
-	line-height: 2.54545455; /* 28px */
+	line-height: 2.72727273; /* 30px */
 	padding: 0 6px;
 	text-align: center;
 }
@@ -76,8 +76,8 @@
 .wp-customizer .wp-picker-input-wrap .button.wp-picker-clear {
 	margin-left: 6px;
 	padding: 0 8px;
-	line-height: 2.54545455; /* 28px */
-	min-height: 30px;
+	line-height: 2.72727273; /* 30px */
+	min-height: 32px;
 }
 
 .wp-picker-container .iris-square-slider .ui-slider-handle:focus {
@@ -97,7 +97,7 @@
 	margin: 0;
 	padding: 0 5px;
 	vertical-align: top;
-	min-height: 30px;
+	min-height: 32px;
 }
 
 .wp-color-picker::-webkit-input-placeholder {

src/wp-admin/css/common.css

@@ -2077,17 +2077,6 @@ p.auto-update-status {
 	box-shadow: 0 2px 0 rgba(0, 0, 0, 0.02), 0 1px 0 rgba(0, 0, 0, 0.02);
 }
 
-.contextual-help-tabs .active::after {
-	content: "";
-	position: absolute;
-	top: 0;
-	right: -1px;
-	width: 2px;
-	height: 100%;
-	background: inherit;
-	z-index: 2;
-}
-
 .contextual-help-tabs .active a {
 	border-color: #c3c4c7;
 	color: #2c3338;

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -437,7 +437,7 @@ protected function get_bulk_actions() {
 			if ( $this->is_trash ) {
 				$actions['untrash'] = __( 'Restore' );
 			} else {
-				$actions['edit'] = __( 'Bulk edit' );
+				$actions['edit'] = _x( 'Bulk edit', 'verb' );
 			}
 		}
 

src/wp-admin/includes/meta-boxes.php

@@ -1453,7 +1453,14 @@ function link_advanced_meta_box( $link ) {
 		<td><input name="link_rss" class="code" type="text" id="rss_uri" maxlength="255" value="<?php echo ( isset( $link->link_rss ) ? esc_attr( $link->link_rss ) : '' ); ?>" /></td>
 	</tr>
 	<tr>
-		<th scope="row"><label for="link_notes"><?php _e( 'Notes' ); ?></label></th>
+		<th scope="row">
+			<label for="link_notes">
+				<?php
+				/* translators: Label for the Notes textarea in the Link Manager edit screen. */
+				_ex( 'Notes', 'Link manager notes field label' );
+				?>
+			</label>
+		</th>
 		<td><textarea name="link_notes" id="link_notes" rows="10"><?php echo $link->link_notes ?? ''; // textarea_escaped ?></textarea></td>
 	</tr>
 	<tr>

src/wp-includes/script-loader.php

@@ -2020,8 +2020,8 @@ function wp_localize_jquery_ui_datepicker() {
 			'currentText'     => __( 'Today' ),
 			'monthNames'      => array_values( $wp_locale->month ),
 			'monthNamesShort' => array_values( $wp_locale->month_abbrev ),
-			'nextText'        => __( 'Next' ),
-			'prevText'        => __( 'Previous' ),
+			'nextText'        => _x( 'Next', 'datepicker: navigate to next month' ),
+			'prevText'        => _x( 'Previous', 'datepicker: navigate to previous month' ),
 			'dayNames'        => array_values( $wp_locale->weekday ),
 			'dayNamesShort'   => array_values( $wp_locale->weekday_abbrev ),
 			'dayNamesMin'     => array_values( $wp_locale->weekday_initial ),

tests/qunit/index.html

@@ -245,7 +245,7 @@ <h3 class="accordion-section-title" tabindex="0">
 			<li class="notice notice-{{ data.type || 'info' }} {{ data.altNotice ? 'notice-alt' : '' }} {{ data.dismissible ? 'is-dismissible' : '' }}" data-code="{{ data.code }}" data-type="{{ data.type }}">
 				{{{ data.message || data.code }}}
 				<# if ( data.dismissible ) { #>
-					<button type="button" class="notice-dismiss"><span class="screen-reader-text"><?php _e( 'Dismiss' ); ?></span></button>
+					<button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss</span></button>
 				<# } #>
 			</li>
 		</script>
@@ -395,14 +395,14 @@ <h3 class="accordion-section-title" tabindex="0">
 		</script>
 
 		<script type="text/html" id="tmpl-nav-menu-locations-header">
-			<span class="customize-control-title customize-section-title-menu_locations-heading"><?php _e( 'Menu Locations' ); ?></span>
+			<span class="customize-control-title customize-section-title-menu_locations-heading">Menu Locations</span>
 			<p class="customize-control-description customize-section-title-menu_locations-description">Something</p>
 		</script>
 
 		<script type="text/html" id="tmpl-nav-menu-create-menu-section-title">
 			<h3>
 				<button type="button" class="button customize-add-menu-button">
-					<?php _e( 'Create New Menu' ); ?>
+					Create New Menu
 				</button>
 			</h3>
 		</script>