Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-28 23:27:39 +02:00
Code Issues Projects Releases Wiki Activity

Twenty Nineteen: Improve custom color behavior for InnerBlocks

Browse Source 
Currently, if a parent block has a custom background color assigned, its child blocks will inherit the parent's text colors — even if the child block has its own custom text color assigned to it. 

This update changes the following: 

- Adjusts Twenty Nineteen's custom background color defaults to target direct children only which fixes the issue

Props kjellr.

See #46432.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
allancole 2019-03-07 22:37:50 +00:00
parent a9ea1b9183
commit df240768e3
4 changed files with 109 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
wp-content/themes/twentynineteen/sass/blocks/_blocks.scss
View File

@ -838,14 +838,14 @@
// Use white text against these backgrounds by default. // Use white text against these backgrounds by default.
color: $color__background-body; color: $color__background-body;
p, > p,
h1, > h1,
h2, > h2,
h3, > h3,
h4, > h4,
h5, > h5,
h6, > h6,
a { > a {
color: $color__background-body; color: $color__background-body;
} }
} }
@ -854,14 +854,14 @@
color: $color__text-main; color: $color__text-main;
// Use dark gray text against this background by default. // Use dark gray text against this background by default.
p, > p,
h1, > h1,
h2, > h2,
h3, > h3,
h4, > h4,
h5, > h5,
h6, > h6,
a { > a {
color: $color__text-main; color: $color__text-main;
} }
} }
@ -894,25 +894,25 @@
//! Custom foreground colors //! Custom foreground colors
.has-primary-color, .has-primary-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-primary-color, .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-primary-color p { .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color > p {
color: $color__link; color: $color__link;
} }
.has-secondary-color, .has-secondary-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color, .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color p { .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color > p {
color: $color__border-link-hover; color: $color__border-link-hover;
} }
.has-dark-gray-color, .has-dark-gray-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color, .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color p { .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color > p {
color: $color__text-main; color: $color__text-main;
} }
.has-light-gray-color, .has-light-gray-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color, .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color,
.wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color p { .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color > p {
color: $color__text-light; color: $color__text-light;
} }

88
wp-content/themes/twentynineteen/style-rtl.css
View File

@ -6075,38 +6075,38 @@ body.page .main-navigation {
color: #fff; color: #fff;
} }
.entry .entry-content .has-primary-background-color p, .entry .entry-content .has-primary-background-color > p,
.entry .entry-content .has-primary-background-color h1, .entry .entry-content .has-primary-background-color > h1,
.entry .entry-content .has-primary-background-color h2, .entry .entry-content .has-primary-background-color > h2,
.entry .entry-content .has-primary-background-color h3, .entry .entry-content .has-primary-background-color > h3,
.entry .entry-content .has-primary-background-color h4, .entry .entry-content .has-primary-background-color > h4,
.entry .entry-content .has-primary-background-color h5, .entry .entry-content .has-primary-background-color > h5,
.entry .entry-content .has-primary-background-color h6, .entry .entry-content .has-primary-background-color > h6,
.entry .entry-content .has-primary-background-color a, .entry .entry-content .has-primary-background-color > a,
.entry .entry-content .has-secondary-background-color p, .entry .entry-content .has-secondary-background-color > p,
.entry .entry-content .has-secondary-background-color h1, .entry .entry-content .has-secondary-background-color > h1,
.entry .entry-content .has-secondary-background-color h2, .entry .entry-content .has-secondary-background-color > h2,
.entry .entry-content .has-secondary-background-color h3, .entry .entry-content .has-secondary-background-color > h3,
.entry .entry-content .has-secondary-background-color h4, .entry .entry-content .has-secondary-background-color > h4,
.entry .entry-content .has-secondary-background-color h5, .entry .entry-content .has-secondary-background-color > h5,
.entry .entry-content .has-secondary-background-color h6, .entry .entry-content .has-secondary-background-color > h6,
.entry .entry-content .has-secondary-background-color a, .entry .entry-content .has-secondary-background-color > a,
.entry .entry-content .has-dark-gray-background-color p, .entry .entry-content .has-dark-gray-background-color > p,
.entry .entry-content .has-dark-gray-background-color h1, .entry .entry-content .has-dark-gray-background-color > h1,
.entry .entry-content .has-dark-gray-background-color h2, .entry .entry-content .has-dark-gray-background-color > h2,
.entry .entry-content .has-dark-gray-background-color h3, .entry .entry-content .has-dark-gray-background-color > h3,
.entry .entry-content .has-dark-gray-background-color h4, .entry .entry-content .has-dark-gray-background-color > h4,
.entry .entry-content .has-dark-gray-background-color h5, .entry .entry-content .has-dark-gray-background-color > h5,
.entry .entry-content .has-dark-gray-background-color h6, .entry .entry-content .has-dark-gray-background-color > h6,
.entry .entry-content .has-dark-gray-background-color a, .entry .entry-content .has-dark-gray-background-color > a,
.entry .entry-content .has-light-gray-background-color p, .entry .entry-content .has-light-gray-background-color > p,
.entry .entry-content .has-light-gray-background-color h1, .entry .entry-content .has-light-gray-background-color > h1,
.entry .entry-content .has-light-gray-background-color h2, .entry .entry-content .has-light-gray-background-color > h2,
.entry .entry-content .has-light-gray-background-color h3, .entry .entry-content .has-light-gray-background-color > h3,
.entry .entry-content .has-light-gray-background-color h4, .entry .entry-content .has-light-gray-background-color > h4,
.entry .entry-content .has-light-gray-background-color h5, .entry .entry-content .has-light-gray-background-color > h5,
.entry .entry-content .has-light-gray-background-color h6, .entry .entry-content .has-light-gray-background-color > h6,
.entry .entry-content .has-light-gray-background-color a { .entry .entry-content .has-light-gray-background-color > a {
color: #fff; color: #fff;
} }
@ -6114,14 +6114,14 @@ body.page .main-navigation {
color: #111; color: #111;
} }
.entry .entry-content .has-white-background-color p, .entry .entry-content .has-white-background-color > p,
.entry .entry-content .has-white-background-color h1, .entry .entry-content .has-white-background-color > h1,
.entry .entry-content .has-white-background-color h2, .entry .entry-content .has-white-background-color > h2,
.entry .entry-content .has-white-background-color h3, .entry .entry-content .has-white-background-color > h3,
.entry .entry-content .has-white-background-color h4, .entry .entry-content .has-white-background-color > h4,
.entry .entry-content .has-white-background-color h5, .entry .entry-content .has-white-background-color > h5,
.entry .entry-content .has-white-background-color h6, .entry .entry-content .has-white-background-color > h6,
.entry .entry-content .has-white-background-color a { .entry .entry-content .has-white-background-color > a {
color: #111; color: #111;
} }
@ -6152,25 +6152,25 @@ body.page .main-navigation {
.entry .entry-content .has-primary-color, .entry .entry-content .has-primary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color > p {
color: #0073aa; color: #0073aa;
} }
.entry .entry-content .has-secondary-color, .entry .entry-content .has-secondary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color > p {
color: #005177; color: #005177;
} }
.entry .entry-content .has-dark-gray-color, .entry .entry-content .has-dark-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color > p {
color: #111; color: #111;
} }
.entry .entry-content .has-light-gray-color, .entry .entry-content .has-light-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color > p {
color: #767676; color: #767676;
} }

88
wp-content/themes/twentynineteen/style.css
View File

@ -6087,38 +6087,38 @@ body.page .main-navigation {
color: #fff; color: #fff;
} }
.entry .entry-content .has-primary-background-color p, .entry .entry-content .has-primary-background-color > p,
.entry .entry-content .has-primary-background-color h1, .entry .entry-content .has-primary-background-color > h1,
.entry .entry-content .has-primary-background-color h2, .entry .entry-content .has-primary-background-color > h2,
.entry .entry-content .has-primary-background-color h3, .entry .entry-content .has-primary-background-color > h3,
.entry .entry-content .has-primary-background-color h4, .entry .entry-content .has-primary-background-color > h4,
.entry .entry-content .has-primary-background-color h5, .entry .entry-content .has-primary-background-color > h5,
.entry .entry-content .has-primary-background-color h6, .entry .entry-content .has-primary-background-color > h6,
.entry .entry-content .has-primary-background-color a, .entry .entry-content .has-primary-background-color > a,
.entry .entry-content .has-secondary-background-color p, .entry .entry-content .has-secondary-background-color > p,
.entry .entry-content .has-secondary-background-color h1, .entry .entry-content .has-secondary-background-color > h1,
.entry .entry-content .has-secondary-background-color h2, .entry .entry-content .has-secondary-background-color > h2,
.entry .entry-content .has-secondary-background-color h3, .entry .entry-content .has-secondary-background-color > h3,
.entry .entry-content .has-secondary-background-color h4, .entry .entry-content .has-secondary-background-color > h4,
.entry .entry-content .has-secondary-background-color h5, .entry .entry-content .has-secondary-background-color > h5,
.entry .entry-content .has-secondary-background-color h6, .entry .entry-content .has-secondary-background-color > h6,
.entry .entry-content .has-secondary-background-color a, .entry .entry-content .has-secondary-background-color > a,
.entry .entry-content .has-dark-gray-background-color p, .entry .entry-content .has-dark-gray-background-color > p,
.entry .entry-content .has-dark-gray-background-color h1, .entry .entry-content .has-dark-gray-background-color > h1,
.entry .entry-content .has-dark-gray-background-color h2, .entry .entry-content .has-dark-gray-background-color > h2,
.entry .entry-content .has-dark-gray-background-color h3, .entry .entry-content .has-dark-gray-background-color > h3,
.entry .entry-content .has-dark-gray-background-color h4, .entry .entry-content .has-dark-gray-background-color > h4,
.entry .entry-content .has-dark-gray-background-color h5, .entry .entry-content .has-dark-gray-background-color > h5,
.entry .entry-content .has-dark-gray-background-color h6, .entry .entry-content .has-dark-gray-background-color > h6,
.entry .entry-content .has-dark-gray-background-color a, .entry .entry-content .has-dark-gray-background-color > a,
.entry .entry-content .has-light-gray-background-color p, .entry .entry-content .has-light-gray-background-color > p,
.entry .entry-content .has-light-gray-background-color h1, .entry .entry-content .has-light-gray-background-color > h1,
.entry .entry-content .has-light-gray-background-color h2, .entry .entry-content .has-light-gray-background-color > h2,
.entry .entry-content .has-light-gray-background-color h3, .entry .entry-content .has-light-gray-background-color > h3,
.entry .entry-content .has-light-gray-background-color h4, .entry .entry-content .has-light-gray-background-color > h4,
.entry .entry-content .has-light-gray-background-color h5, .entry .entry-content .has-light-gray-background-color > h5,
.entry .entry-content .has-light-gray-background-color h6, .entry .entry-content .has-light-gray-background-color > h6,
.entry .entry-content .has-light-gray-background-color a { .entry .entry-content .has-light-gray-background-color > a {
color: #fff; color: #fff;
} }
@ -6126,14 +6126,14 @@ body.page .main-navigation {
color: #111; color: #111;
} }
.entry .entry-content .has-white-background-color p, .entry .entry-content .has-white-background-color > p,
.entry .entry-content .has-white-background-color h1, .entry .entry-content .has-white-background-color > h1,
.entry .entry-content .has-white-background-color h2, .entry .entry-content .has-white-background-color > h2,
.entry .entry-content .has-white-background-color h3, .entry .entry-content .has-white-background-color > h3,
.entry .entry-content .has-white-background-color h4, .entry .entry-content .has-white-background-color > h4,
.entry .entry-content .has-white-background-color h5, .entry .entry-content .has-white-background-color > h5,
.entry .entry-content .has-white-background-color h6, .entry .entry-content .has-white-background-color > h6,
.entry .entry-content .has-white-background-color a { .entry .entry-content .has-white-background-color > a {
color: #111; color: #111;
} }
@ -6164,25 +6164,25 @@ body.page .main-navigation {
.entry .entry-content .has-primary-color, .entry .entry-content .has-primary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-primary-color > p {
color: #0073aa; color: #0073aa;
} }
.entry .entry-content .has-secondary-color, .entry .entry-content .has-secondary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-secondary-color > p {
color: #005177; color: #005177;
} }
.entry .entry-content .has-dark-gray-color, .entry .entry-content .has-dark-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-dark-gray-color > p {
color: #111; color: #111;
} }
.entry .entry-content .has-light-gray-color, .entry .entry-content .has-light-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color, .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color,
.entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color p { .entry .entry-content .wp-block-pullquote.is-style-solid-color blockquote.has-light-gray-color > p {
color: #767676; color: #767676;
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.2-alpha-44816'; $wp_version = '5.2-alpha-44818';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.