Ticket #42022: 42022.7.diff

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

@@ -270 +270 @@
         margin-bottom: 15px;
 }
 
-.date-time-fields {
-        padding-top: 10px;
-        padding-bottom:10px;
+.customize-control-date_time .customize-control-description + .date-time-fields.includes-time {
+        margin-top: 10px;
 }
 
 .customize-control.customize-control-date_time .date-time-fields .date-input,
@@ -280 +279 @@
         float: left;
         margin-right: 5px;
 }
+.customize-control.customize-control-date_time .date-time-fields .date-input.day {
+        margin-right: 0;
+}
 
 .date-time-fields .date-input.month {
         width: auto;

src/wp-includes/customize/class-wp-customize-date-time-control.php

@@ -112 +112 @@
                 <# _.defaults( data, <?php echo wp_json_encode( $data ); ?> ); #>
                 <# var idPrefix = _.uniqueId( 'el' ) + '-'; #>
 
-                <span class="customize-control-title">
-                        {{ data.label }}
-                </span>
+                <# if ( data.label ) { #>
+                        <span class="customize-control-title">
+                                {{ data.label }}
+                        </span>
+                <# } #>
                 <div class="customize-control-notifications-container"></div>
-                <span class="description customize-control-description">{{ data.description }}</span>
-                <div class="date-time-fields">
+                <# if ( data.description ) { #>
+                        <span class="description customize-control-description">{{ data.description }}</span>
+                <# } #>
+                <div class="date-time-fields {{ data.includeTime ? 'includes-time' : '' }}">
                         <fieldset class="day-row">
-                                <legend class="title-day"><?php esc_html_e( 'Date' ); ?></legend>
+                                <legend class="title-day {{ ! data.includeTime ? 'screen-reader-text' : '' }}"><?php esc_html_e( 'Date' ); ?></legend>
                                 <div class="day-fields clear">
                                         <label for="{{ idPrefix }}date-time-month" class="screen-reader-text"><?php esc_html_e( 'Month' ); ?></label>
                                         <select id="{{ idPrefix }}date-time-month" class="date-input month" data-component="month">