From 56e463a38eb9739e878aed4e9b86bda1db2b4224 Mon Sep 17 00:00:00 2001 From: Dominik Schilling Date: Tue, 5 Jul 2016 12:42:27 +0000 Subject: [PATCH] Customize: Fix site icon preview in RTL. * Set the direction of previews to LTR. * Remove the ID attribute from the favicon preview in the customizer panel. The preview in the media modal uses the same ID which prevented updating the correct favicon preview. Fixes #37286. Built from https://develop.svn.wordpress.org/trunk@37964 git-svn-id: http://core.svn.wordpress.org/trunk@37905 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/css/site-icon-rtl.css | 6 ++++++ wp-admin/css/site-icon-rtl.min.css | 2 +- wp-admin/css/site-icon.css | 6 ++++++ wp-admin/css/site-icon.min.css | 2 +- .../customize/class-wp-customize-site-icon-control.php | 2 +- wp-includes/version.php | 2 +- 6 files changed, 16 insertions(+), 4 deletions(-) diff --git a/wp-admin/css/site-icon-rtl.css b/wp-admin/css/site-icon-rtl.css index b66fda377a..09ea369abe 100644 --- a/wp-admin/css/site-icon-rtl.css +++ b/wp-admin/css/site-icon-rtl.css @@ -38,6 +38,12 @@ margin-top: 5px; } +/* rtl:ignore */ +.site-icon-preview .favicon, +.site-icon-preview .app-icon-preview { + direction: ltr; +} + .customize-control-site_icon .favicon-preview { float: right; margin-left: 12px; diff --git a/wp-admin/css/site-icon-rtl.min.css b/wp-admin/css/site-icon-rtl.min.css index 56586516fc..10f1e6565f 100644 --- a/wp-admin/css/site-icon-rtl.min.css +++ b/wp-admin/css/site-icon-rtl.min.css @@ -1 +1 @@ -.site-icon-preview .favicon-preview{margin:5px 0 20px;overflow:hidden;position:relative;max-width:180px}.site-icon-preview .browser-title,.site-icon-preview .favicon{height:16px;right:88px;overflow:hidden;position:absolute;top:16px}.site-icon-preview .favicon{width:16px}.site-icon-preview .browser-title{right:109px;width:72px;white-space:nowrap}.site-icon-preview .app-icon-preview{background-color:#000;-webkit-border-radius:16px;border-radius:16px;height:64px;overflow:hidden;width:64px;margin-top:5px}.customize-control-site_icon .favicon-preview{float:right;margin-left:12px;margin-bottom:0}.customize-control-site_icon .app-icon-preview{margin-top:9px} \ No newline at end of file +.site-icon-preview .favicon-preview{margin:5px 0 20px;overflow:hidden;position:relative;max-width:180px}.site-icon-preview .browser-title,.site-icon-preview .favicon{height:16px;right:88px;overflow:hidden;position:absolute;top:16px}.site-icon-preview .favicon{width:16px}.site-icon-preview .browser-title{right:109px;width:72px;white-space:nowrap}.site-icon-preview .app-icon-preview{background-color:#000;-webkit-border-radius:16px;border-radius:16px;height:64px;overflow:hidden;width:64px;margin-top:5px}.site-icon-preview .app-icon-preview,.site-icon-preview .favicon{direction:ltr}.customize-control-site_icon .favicon-preview{float:right;margin-left:12px;margin-bottom:0}.customize-control-site_icon .app-icon-preview{margin-top:9px} \ No newline at end of file diff --git a/wp-admin/css/site-icon.css b/wp-admin/css/site-icon.css index 77b8425323..a4ac1ed2c3 100644 --- a/wp-admin/css/site-icon.css +++ b/wp-admin/css/site-icon.css @@ -38,6 +38,12 @@ margin-top: 5px; } +/* rtl:ignore */ +.site-icon-preview .favicon, +.site-icon-preview .app-icon-preview { + direction: ltr; +} + .customize-control-site_icon .favicon-preview { float: left; margin-right: 12px; diff --git a/wp-admin/css/site-icon.min.css b/wp-admin/css/site-icon.min.css index c5b9111c7f..df0e33978e 100644 --- a/wp-admin/css/site-icon.min.css +++ b/wp-admin/css/site-icon.min.css @@ -1 +1 @@ -.site-icon-preview .favicon-preview{margin:5px 0 20px;overflow:hidden;position:relative;max-width:180px}.site-icon-preview .browser-title,.site-icon-preview .favicon{height:16px;left:88px;overflow:hidden;position:absolute;top:16px}.site-icon-preview .favicon{width:16px}.site-icon-preview .browser-title{left:109px;width:72px;white-space:nowrap}.site-icon-preview .app-icon-preview{background-color:#000;-webkit-border-radius:16px;border-radius:16px;height:64px;overflow:hidden;width:64px;margin-top:5px}.customize-control-site_icon .favicon-preview{float:left;margin-right:12px;margin-bottom:0}.customize-control-site_icon .app-icon-preview{margin-top:9px} \ No newline at end of file +.site-icon-preview .favicon-preview{margin:5px 0 20px;overflow:hidden;position:relative;max-width:180px}.site-icon-preview .browser-title,.site-icon-preview .favicon{height:16px;left:88px;overflow:hidden;position:absolute;top:16px}.site-icon-preview .favicon{width:16px}.site-icon-preview .browser-title{left:109px;width:72px;white-space:nowrap}.site-icon-preview .app-icon-preview{background-color:#000;-webkit-border-radius:16px;border-radius:16px;height:64px;overflow:hidden;width:64px;margin-top:5px}.site-icon-preview .app-icon-preview,.site-icon-preview .favicon{direction:ltr}.customize-control-site_icon .favicon-preview{float:left;margin-right:12px;margin-bottom:0}.customize-control-site_icon .app-icon-preview{margin-top:9px} \ No newline at end of file diff --git a/wp-includes/customize/class-wp-customize-site-icon-control.php b/wp-includes/customize/class-wp-customize-site-icon-control.php index b82001f01a..58fea53757 100644 --- a/wp-includes/customize/class-wp-customize-site-icon-control.php +++ b/wp-includes/customize/class-wp-customize-site-icon-control.php @@ -67,7 +67,7 @@ class WP_Customize_Site_Icon_Control extends WP_Customize_Cropped_Image_Control
- <?php esc_attr_e( 'Preview as a browser icon' ); ?> + <?php esc_attr_e( 'Preview as a browser icon' ); ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php index 47bddff9be..12b8c76f0b 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.6-beta1-37963'; +$wp_version = '4.6-beta1-37964'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.