WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Twenty Fifteen: check if user-selected custom colors are the same as default so we're not duplicating styles. 

Props iamtakashi, fixes #30234


Built from https://develop.svn.wordpress.org/trunk@30221


git-svn-id: http://core.svn.wordpress.org/trunk@30221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Ian Stewart 2014-11-03 21:59:22 +00:00
parent 8a930c93a8
commit 7dfb040dde
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-content/themes/twentyfifteen/inc/custom-header.php
View File

@ -167,10 +167,12 @@ endif; // twentyfifteen_admin_header_image
* @since Twenty Fifteen 1.0
*/
function twentyfifteen_header_background_color_css() {
$color_scheme = twentyfifteen_get_color_scheme();
$default_color = $color_scheme[1];
$header_background_color = get_theme_mod( 'header_background_color', '#ffffff' );
// Don't do anything if the current color is the default.
if ( '#ffffff' === $header_background_color ) {
if ( $header_background_color === $default_color ) {
return;
}
@ -209,10 +211,12 @@ add_action( 'wp_enqueue_scripts', 'twentyfifteen_header_background_color_css', 1
* @since Twenty Fifteen 1.0
*/
function twentyfifteen_sidebar_text_color_css() {
$color_scheme = twentyfifteen_get_color_scheme();
$default_color = $color_scheme[4];
$sidebar_link_color = get_theme_mod( 'sidebar_textcolor', '#333333' );
// Don't do anything if the current color is the default.
if ( '#333333' === $sidebar_link_color ) {
if ( $sidebar_link_color === $default_color ) {
return;
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-alpha-30220';
$wp_version = '4.1-alpha-30221';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.