Accessibility: Make buttons to add site images look like buttons.

The buttons to add site icons, logos, header images, and background images were designed with a dashed border. This led to confusion with users thinking they were drop regions for image uploads, rather than buttons to trigger an upload.

Change design of upload buttons to clarify expected user interaction.

Props emaildano, afercia, joedolson, ankitkumarshah, logicrays, shailu25.
Fixes #47579.

git-svn-id: https://develop.svn.wordpress.org/trunk@60645 602fd350-edb4-49c9-b593-d223f7449a82

Author: joedolson

src/js/_enqueues/wp/customize/views.js

@@ -37,10 +37,14 @@
 
 		setButtons: function() {
 			var elements = $('#customize-control-header_image .actions .remove');
+			var addButton = $('#customize-control-header_image .actions .new');
+
 			if (this.model.get('choice')) {
 				elements.show();
+				addButton.removeClass('upload-button');
 			} else {
 				elements.hide();
+				addButton.addClass('upload-button');
 			}
 		}
 	});

src/wp-admin/css/customize-controls.css

@@ -1441,6 +1441,21 @@ p.customize-section-description {
 	white-space: normal;
 }
 
+.customize-control .attachment-media-view .upload-button {
+	width: 100%;
+	padding: 9px 0;
+}
+
+.customize-control .attachment-media-view .upload-button.control-focus {
+	width: auto;
+	padding: 0 10px;
+}
+
+.customize-control.customize-control-header .actions .upload-button.button.new {
+	width: 100%;
+	padding: 9px 0;
+}
+
 .customize-control .attachment-media-view .thumbnail,
 .customize-control-header .current .container {
 	overflow: hidden;
@@ -2990,6 +3005,10 @@ body.adding-widget .add-new-widget:before,
 		vertical-align: middle;
 	}
 
+	.customize-control .attachment-media-view .upload-button {
+		padding: 5px 0;
+	}
+
 	#customize-control-changeset_status .customize-inside-control-row {
 		padding-top: 15px;
 	}

src/wp-admin/css/forms.css

@@ -789,32 +789,6 @@ ul#add-to-blog-users {
 	outline: 2px solid transparent;
 }
 
-.button-add-site-icon {
-	width: 100%;
-	cursor: pointer;
-	text-align: center;
-	border: 1px dashed #c3c4c7;
-	box-sizing: border-box;
-	padding: 9px 0;
-	line-height: 1.6;
-	max-width: 270px;
-	border-radius: 4px;
-	background: #f0f0f1;
-}
-
-.button-add-site-icon:focus,
-.button-add-site-icon:hover {
-	background: #fff;
-}
-
-.button-add-site-icon:focus {
-	background-color: #fff;
-	border-color: #3582c4;
-	border-style: solid;
-	box-shadow: 0 0 0 1px #3582c4;
-	outline: 2px solid transparent;
-}
-
 /*------------------------------------------------------------------------------
   15.0 - Comments Screen
 ------------------------------------------------------------------------------*/

src/wp-admin/options-general.php

@@ -105,7 +105,7 @@
 	wp_enqueue_media();
 	wp_enqueue_script( 'site-icon' );
 
-	$classes_for_upload_button = 'upload-button button-add-media button-add-site-icon';
+	$classes_for_upload_button = 'upload-button button-hero button';
 	$classes_for_update_button = 'button';
 	$classes_for_wrapper       = '';
 

src/wp-includes/customize/class-wp-customize-header-image-control.php

@@ -173,12 +173,6 @@ public function print_header_image_template() {
 			<img src="{{data.header.thumbnail_url}}" alt="{{data.header.alt_text || data.header.description}}" />
 
 				<# } #>
-			<# } else { #>
-
-			<div class="placeholder">
-				<?php _e( 'No image set' ); ?>
-			</div>
-
 			<# } #>
 		</script>
 		<?php
@@ -246,7 +240,7 @@ public function render_content() {
 			<div class="actions">
 				<?php if ( current_user_can( 'upload_files' ) ) : ?>
 				<button type="button"<?php echo $visibility; ?> class="button remove" aria-label="<?php esc_attr_e( 'Hide header image' ); ?>"><?php _e( 'Hide image' ); ?></button>
-				<button type="button" class="button new" id="header_image-button" aria-label="<?php esc_attr_e( 'Add Header Image' ); ?>"><?php _e( 'Add Image' ); ?></button>
+				<button type="button" class="button new <?php echo ! $this->get_current_image_src() ? '' : 'customize-header-image-not-selected'; ?>" id="header_image-button" aria-label="<?php esc_attr_e( 'Add Header Image' ); ?>"><?php _e( 'Add Image' ); ?></button>
 				<?php endif; ?>
 			</div>
 			<div class="choices">

src/wp-includes/customize/class-wp-customize-media-control.php

@@ -196,7 +196,7 @@ public function content_template() {
 		<# } else { #>
 			<div class="attachment-media-view">
 				<# if ( data.canUpload ) { #>
-					<button type="button" class="upload-button button-add-media" {{{ describedByAttr }}}>{{ data.button_labels.select }}</button>
+					<button type="button" class="upload-button button" {{{ describedByAttr }}}>{{ data.button_labels.select }}</button>
 				<# } #>
 				<div class="actions">
 					<# if ( data.defaultAttachment ) { #>

src/wp-includes/customize/class-wp-customize-site-icon-control.php

@@ -126,7 +126,7 @@ public function content_template() {
 		<# } else { #>
 			<div class="attachment-media-view">
 				<# if ( data.canUpload ) { #>
-					<button type="button" class="upload-button button-add-media"><?php echo $this->button_labels['site_icon']; ?></button>
+					<button type="button" class="upload-button button"><?php echo $this->button_labels['site_icon']; ?></button>
 				<# } #>
 				<div class="actions">
 					<# if ( data.defaultAttachment ) { #>