Customize: Clean up media control CSS.
Removes unnecessary wrapper elements and refactors class names to eliminate duplication of rule selectors. Props celloexpressions. Fixes #30618. Built from https://develop.svn.wordpress.org/trunk@37426 git-svn-id: http://core.svn.wordpress.org/trunk@37392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter
parent
97fc82a879
commit
b036bf1012
|
|
@ -524,7 +524,7 @@ p.customize-section-description {
|
|||
font-size: 14px;
|
||||
line-height: 24px;
|
||||
font-weight: 600;
|
||||
margin-bottom: 5px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.customize-control-description {
|
||||
|
|
@ -720,12 +720,10 @@ p.customize-section-description {
|
|||
|
||||
/* Media controls */
|
||||
|
||||
.customize-control-media .current,
|
||||
.customize-control-upload .current,
|
||||
.customize-control-image .current,
|
||||
.customize-control-background .current,
|
||||
.customize-control-cropped_image .current,
|
||||
.customize-control-site_icon .current,
|
||||
.customize-control .attachment-media-view .actions {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.customize-control-header .current {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
|
@ -749,24 +747,9 @@ p.customize-section-description {
|
|||
display: block;
|
||||
}
|
||||
|
||||
.customize-control-media .remove-button,
|
||||
.customize-control-media .default-button,
|
||||
.customize-control-media .upload-button,
|
||||
.customize-control-upload .remove-button,
|
||||
.customize-control-upload .default-button,
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .remove-button,
|
||||
.customize-control-image .default-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-background .remove-button,
|
||||
.customize-control-background .default-button,
|
||||
.customize-control-background .upload-button,
|
||||
.customize-control-cropped_image .remove-button,
|
||||
.customize-control-cropped_image .default-button,
|
||||
.customize-control-cropped_image .upload-button,
|
||||
.customize-control-site_icon .remove-button,
|
||||
.customize-control-site_icon .default-button,
|
||||
.customize-control-site_icon .upload-button,
|
||||
.customize-control .attachment-media-view .remove-button,
|
||||
.customize-control .attachment-media-view .default-button,
|
||||
.customize-control .attachment-media-view .upload-button,
|
||||
.customize-control-header button.new,
|
||||
.customize-control-header button.remove {
|
||||
white-space: normal;
|
||||
|
|
@ -774,35 +757,12 @@ p.customize-section-description {
|
|||
height: auto;
|
||||
}
|
||||
|
||||
.customize-control-media .current .container,
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-image .current .container,
|
||||
.customize-control-background .current .container,
|
||||
.customize-control-cropped_image .current .container,
|
||||
.customize-control-site_icon .current .container,
|
||||
.customize-control .attachment-media-view .thumbnail,
|
||||
.customize-control-header .current .container {
|
||||
overflow: hidden;
|
||||
-webkit-border-radius: 2px;
|
||||
border: 1px solid #eee;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
.customize-control-media .current .container,
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-background .current .container,
|
||||
.customize-control-cropped_image .current .container,
|
||||
.customize-control-site_icon .current .container,
|
||||
.customize-control-image .current .container {
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-media .placeholder,
|
||||
.customize-control-upload .placeholder,
|
||||
.customize-control-image .placeholder,
|
||||
.customize-control-background .placeholder,
|
||||
.customize-control-cropped_image .placeholder,
|
||||
.customize-control-site_icon .placeholder,
|
||||
.customize-control .attachment-media-view .placeholder,
|
||||
.customize-control-header .placeholder {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
|
|
@ -812,15 +772,10 @@ p.customize-section-description {
|
|||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
min-height: 40px;
|
||||
padding: 9px 0;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.customize-control-media .inner,
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-background .inner,
|
||||
.customize-control-cropped_image .inner,
|
||||
.customize-control-site_icon .inner,
|
||||
.customize-control-header .inner {
|
||||
display: none;
|
||||
position: absolute;
|
||||
|
|
@ -831,22 +786,6 @@ p.customize-section-description {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
.customize-control-media .inner,
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-background .inner,
|
||||
.customize-control-cropped_image .inner,
|
||||
.customize-control-site_icon .inner,
|
||||
.customize-control-image .inner {
|
||||
display: block;
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-media .inner,
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-background .inner,
|
||||
.customize-control-cropped_image .inner,
|
||||
.customize-control-site_icon .inner,
|
||||
.customize-control-header .inner,
|
||||
.customize-control-header .inner .dashicons {
|
||||
line-height: 20px;
|
||||
|
|
@ -956,40 +895,19 @@ p.customize-section-description {
|
|||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.customize-control-media img,
|
||||
.customize-control-upload img,
|
||||
.customize-control-image img,
|
||||
.customize-control-background img,
|
||||
.customize-control-cropped_image img,
|
||||
.customize-control .attachment-media-view .thumbnail-image img,
|
||||
.customize-control-header img {
|
||||
width: 100%;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
.customize-control-media .remove-button,
|
||||
.customize-control-media .default-button,
|
||||
.customize-control-upload .remove-button,
|
||||
.customize-control-upload .default-button,
|
||||
.customize-control-image .remove-button,
|
||||
.customize-control-image .default-button,
|
||||
.customize-control-background .remove-button,
|
||||
.customize-control-background .default-button,
|
||||
.customize-control-cropped_image .remove-button,
|
||||
.customize-control-cropped_image .default-button,
|
||||
.customize-control-site_icon .remove-button,
|
||||
.customize-control-site_icon .default-button,
|
||||
.customize-control .attachment-media-view .remove-button,
|
||||
.customize-control .attachment-media-view .default-button,
|
||||
.customize-control-header .remove {
|
||||
float: right;
|
||||
margin-left: 3px;
|
||||
}
|
||||
|
||||
.customize-control-media .upload-button,
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-background .upload-button,
|
||||
.customize-control-cropped_image .upload-button,
|
||||
.customize-control-site_icon .upload-button,
|
||||
.customize-control .attachment-media-view .upload-button,
|
||||
.customize-control-header .new {
|
||||
float: left;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -524,7 +524,7 @@ p.customize-section-description {
|
|||
font-size: 14px;
|
||||
line-height: 24px;
|
||||
font-weight: 600;
|
||||
margin-bottom: 5px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
.customize-control-description {
|
||||
|
|
@ -720,12 +720,10 @@ p.customize-section-description {
|
|||
|
||||
/* Media controls */
|
||||
|
||||
.customize-control-media .current,
|
||||
.customize-control-upload .current,
|
||||
.customize-control-image .current,
|
||||
.customize-control-background .current,
|
||||
.customize-control-cropped_image .current,
|
||||
.customize-control-site_icon .current,
|
||||
.customize-control .attachment-media-view .actions {
|
||||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.customize-control-header .current {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
|
@ -749,24 +747,9 @@ p.customize-section-description {
|
|||
display: block;
|
||||
}
|
||||
|
||||
.customize-control-media .remove-button,
|
||||
.customize-control-media .default-button,
|
||||
.customize-control-media .upload-button,
|
||||
.customize-control-upload .remove-button,
|
||||
.customize-control-upload .default-button,
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .remove-button,
|
||||
.customize-control-image .default-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-background .remove-button,
|
||||
.customize-control-background .default-button,
|
||||
.customize-control-background .upload-button,
|
||||
.customize-control-cropped_image .remove-button,
|
||||
.customize-control-cropped_image .default-button,
|
||||
.customize-control-cropped_image .upload-button,
|
||||
.customize-control-site_icon .remove-button,
|
||||
.customize-control-site_icon .default-button,
|
||||
.customize-control-site_icon .upload-button,
|
||||
.customize-control .attachment-media-view .remove-button,
|
||||
.customize-control .attachment-media-view .default-button,
|
||||
.customize-control .attachment-media-view .upload-button,
|
||||
.customize-control-header button.new,
|
||||
.customize-control-header button.remove {
|
||||
white-space: normal;
|
||||
|
|
@ -774,35 +757,12 @@ p.customize-section-description {
|
|||
height: auto;
|
||||
}
|
||||
|
||||
.customize-control-media .current .container,
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-image .current .container,
|
||||
.customize-control-background .current .container,
|
||||
.customize-control-cropped_image .current .container,
|
||||
.customize-control-site_icon .current .container,
|
||||
.customize-control .attachment-media-view .thumbnail,
|
||||
.customize-control-header .current .container {
|
||||
overflow: hidden;
|
||||
-webkit-border-radius: 2px;
|
||||
border: 1px solid #eee;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
.customize-control-media .current .container,
|
||||
.customize-control-upload .current .container,
|
||||
.customize-control-background .current .container,
|
||||
.customize-control-cropped_image .current .container,
|
||||
.customize-control-site_icon .current .container,
|
||||
.customize-control-image .current .container {
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-media .placeholder,
|
||||
.customize-control-upload .placeholder,
|
||||
.customize-control-image .placeholder,
|
||||
.customize-control-background .placeholder,
|
||||
.customize-control-cropped_image .placeholder,
|
||||
.customize-control-site_icon .placeholder,
|
||||
.customize-control .attachment-media-view .placeholder,
|
||||
.customize-control-header .placeholder {
|
||||
width: 100%;
|
||||
position: relative;
|
||||
|
|
@ -812,15 +772,10 @@ p.customize-section-description {
|
|||
-webkit-box-sizing: border-box;
|
||||
-moz-box-sizing: border-box;
|
||||
box-sizing: border-box;
|
||||
min-height: 40px;
|
||||
padding: 9px 0;
|
||||
line-height: 20px;
|
||||
}
|
||||
|
||||
.customize-control-media .inner,
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-background .inner,
|
||||
.customize-control-cropped_image .inner,
|
||||
.customize-control-site_icon .inner,
|
||||
.customize-control-header .inner {
|
||||
display: none;
|
||||
position: absolute;
|
||||
|
|
@ -831,22 +786,6 @@ p.customize-section-description {
|
|||
overflow: hidden;
|
||||
}
|
||||
|
||||
.customize-control-media .inner,
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-background .inner,
|
||||
.customize-control-cropped_image .inner,
|
||||
.customize-control-site_icon .inner,
|
||||
.customize-control-image .inner {
|
||||
display: block;
|
||||
min-height: 40px;
|
||||
}
|
||||
|
||||
.customize-control-media .inner,
|
||||
.customize-control-upload .inner,
|
||||
.customize-control-image .inner,
|
||||
.customize-control-background .inner,
|
||||
.customize-control-cropped_image .inner,
|
||||
.customize-control-site_icon .inner,
|
||||
.customize-control-header .inner,
|
||||
.customize-control-header .inner .dashicons {
|
||||
line-height: 20px;
|
||||
|
|
@ -956,40 +895,19 @@ p.customize-section-description {
|
|||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.customize-control-media img,
|
||||
.customize-control-upload img,
|
||||
.customize-control-image img,
|
||||
.customize-control-background img,
|
||||
.customize-control-cropped_image img,
|
||||
.customize-control .attachment-media-view .thumbnail-image img,
|
||||
.customize-control-header img {
|
||||
width: 100%;
|
||||
-webkit-border-radius: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
|
||||
.customize-control-media .remove-button,
|
||||
.customize-control-media .default-button,
|
||||
.customize-control-upload .remove-button,
|
||||
.customize-control-upload .default-button,
|
||||
.customize-control-image .remove-button,
|
||||
.customize-control-image .default-button,
|
||||
.customize-control-background .remove-button,
|
||||
.customize-control-background .default-button,
|
||||
.customize-control-cropped_image .remove-button,
|
||||
.customize-control-cropped_image .default-button,
|
||||
.customize-control-site_icon .remove-button,
|
||||
.customize-control-site_icon .default-button,
|
||||
.customize-control .attachment-media-view .remove-button,
|
||||
.customize-control .attachment-media-view .default-button,
|
||||
.customize-control-header .remove {
|
||||
float: left;
|
||||
margin-right: 3px;
|
||||
}
|
||||
|
||||
.customize-control-media .upload-button,
|
||||
.customize-control-upload .upload-button,
|
||||
.customize-control-image .upload-button,
|
||||
.customize-control-background .upload-button,
|
||||
.customize-control-cropped_image .upload-button,
|
||||
.customize-control-site_icon .upload-button,
|
||||
.customize-control .attachment-media-view .upload-button,
|
||||
.customize-control-header .new {
|
||||
float: right;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -121,15 +121,12 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
|
|||
<# if (data.random) { #>
|
||||
|
||||
<div class="placeholder">
|
||||
<div class="inner">
|
||||
<span><span class="dashicons dashicons-randomize dice"></span>
|
||||
<span class="dashicons dashicons-randomize dice"></span>
|
||||
<# if ( data.type === 'uploaded' ) { #>
|
||||
<?php _e( 'Randomizing uploaded headers' ); ?>
|
||||
<# } else if ( data.type === 'default' ) { #>
|
||||
<?php _e( 'Randomizing suggested headers' ); ?>
|
||||
<# } #>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<# } else { #>
|
||||
|
|
@ -140,11 +137,7 @@ class WP_Customize_Header_Image_Control extends WP_Customize_Image_Control {
|
|||
<# } else { #>
|
||||
|
||||
<div class="placeholder">
|
||||
<div class="inner">
|
||||
<span>
|
||||
<?php _e( 'No image set' ); ?>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<# } #>
|
||||
|
|
|
|||
|
|
@ -154,8 +154,6 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
|
|||
</label>
|
||||
|
||||
<# if ( data.attachment && data.attachment.id ) { #>
|
||||
<div class="current">
|
||||
<div class="container">
|
||||
<div class="attachment-media-view attachment-media-view-{{ data.attachment.type }} {{ data.attachment.orientation }}">
|
||||
<div class="thumbnail thumbnail-{{ data.attachment.type }}">
|
||||
<# if ( 'image' === data.attachment.type && data.attachment.sizes && data.attachment.sizes.medium ) { #>
|
||||
|
|
@ -190,9 +188,6 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
|
|||
<p class="attachment-title">{{ data.attachment.title }}</p>
|
||||
<# } #>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<# if ( data.canUpload ) { #>
|
||||
<button type="button" class="button remove-button">{{ data.button_labels.remove }}</button>
|
||||
|
|
@ -200,17 +195,11 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
|
|||
<div style="clear:both"></div>
|
||||
<# } #>
|
||||
</div>
|
||||
</div>
|
||||
<# } else { #>
|
||||
<div class="current">
|
||||
<div class="container">
|
||||
<div class="attachment-media-view">
|
||||
<div class="placeholder">
|
||||
<div class="inner">
|
||||
<span>
|
||||
{{ data.button_labels.placeholder }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<# if ( data.defaultAttachment ) { #>
|
||||
|
|
@ -221,6 +210,7 @@ class WP_Customize_Media_Control extends WP_Customize_Control {
|
|||
<# } #>
|
||||
<div style="clear:both"></div>
|
||||
</div>
|
||||
</div>
|
||||
<# } #>
|
||||
<?php
|
||||
}
|
||||
|
|
|
|||
|
|
@ -60,8 +60,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
|
|||
</label>
|
||||
|
||||
<# if ( data.attachment && data.attachment.id ) { #>
|
||||
<div class="current">
|
||||
<div class="container">
|
||||
<div class="attachment-media-view">
|
||||
<div class="site-icon-preview">
|
||||
<div class="favicon-preview">
|
||||
<img src="<?php echo esc_url( admin_url( 'images/browser.png' ) ); ?>" class="browser-preview" width="182" alt="" />
|
||||
|
|
@ -73,8 +72,6 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
|
|||
</div>
|
||||
<img class="app-icon-preview" src="{{ data.attachment.sizes.full.url }}" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<# if ( data.canUpload ) { #>
|
||||
<button type="button" class="button remove-button"><?php echo $this->button_labels['remove']; ?></button>
|
||||
|
|
@ -82,15 +79,11 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
|
|||
<div style="clear:both"></div>
|
||||
<# } #>
|
||||
</div>
|
||||
</div>
|
||||
<# } else { #>
|
||||
<div class="current">
|
||||
<div class="container">
|
||||
<div class="attachment-media-view">
|
||||
<div class="placeholder">
|
||||
<div class="inner">
|
||||
<span><?php echo $this->button_labels['placeholder']; ?></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo $this->button_labels['placeholder']; ?>
|
||||
</div>
|
||||
<div class="actions">
|
||||
<# if ( data.defaultAttachment ) { #>
|
||||
|
|
@ -101,6 +94,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
|
|||
<# } #>
|
||||
<div style="clear:both"></div>
|
||||
</div>
|
||||
</div>
|
||||
<# } #>
|
||||
<?php
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '4.6-alpha-37425';
|
||||
$wp_version = '4.6-alpha-37426';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
|
|
|||
Loading…
Reference in New Issue