Skip to content

Commit 2f96d11

Browse files
Twenty Sixteen: Ensure the Quote block inherits group color settings.
The purpose of this change is to ensure that the quote block and the quote block cite inherits the text color from the parent block, if: * The parent has a text color set in the block settings, and * The quote block does not have a text color set in the block settings. Follow-up to [43799], [56087]. Props poena, melchoyce, sabernhardt, mukesh27, apermo, SergeyBiryukov. Fixes #51236. Built from https://develop.svn.wordpress.org/trunk@61441 git-svn-id: http://core.svn.wordpress.org/trunk@60753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
1 parent e160907 commit 2f96d11

File tree

5 files changed

+33
-22
lines changed

5 files changed

+33
-22
lines changed

wp-content/themes/twentysixteen/css/blocks.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ p.has-drop-cap:not(:focus)::first-letter {
7777
.wp-block-quote {
7878
border-width: 0 0 0 4px;
7979
}
80-
80+
8181
:where(.rtl) .wp-block-quote {
8282
border-width: 0 4px 0 0;
8383
}
@@ -106,6 +106,11 @@ p.has-drop-cap:not(:focus)::first-letter {
106106
color: inherit;
107107
}
108108

109+
.has-text-color .wp-block-quote:not(.has-text-color),
110+
.has-text-color .wp-block-quote:not(.has-text-color) cite {
111+
color: inherit;
112+
}
113+
109114
.wp-block-quote cite:before {
110115
content: "\2014\00a0";
111116
}

wp-content/themes/twentysixteen/css/editor-blocks.css

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,8 @@ figure[class*="wp-block-"] > figcaption {
321321
margin-bottom: 1.4736842105em;
322322
}
323323

324-
.wp-block-quote__citation {
324+
.wp-block-quote__citation,
325+
.wp-block-quote cite {
325326
color: #1a1a1a;
326327
display: block;
327328
font-size: 16px;
@@ -333,6 +334,11 @@ figure[class*="wp-block-"] > figcaption {
333334
color: inherit;
334335
}
335336

337+
.has-text-color .wp-block-quote:not(.has-text-color),
338+
.has-text-color .wp-block-quote:not(.has-text-color) cite {
339+
color: inherit;
340+
}
341+
336342
.wp-block-quote__citation:before {
337343
content: "\2014\00a0";
338344
}
@@ -550,7 +556,7 @@ figure[class*="wp-block-"] > figcaption {
550556
.wp-block-pullquote[style*="font-size"] cite {
551557
font-size: inherit;
552558
}
553-
559+
554560
.wp-block-pullquote[style*="line-height"] blockquote,
555561
.wp-block-pullquote[style*="line-height"] blockquote p,
556562
.wp-block-pullquote[style*="line-height"] cite {

wp-includes/css/dist/index.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88

99
return array(
1010
array(
11-
'handle' => 'wp-list-reusable-blocks',
12-
'path' => 'list-reusable-blocks/style',
11+
'handle' => 'wp-preferences',
12+
'path' => 'preferences/style',
1313
'dependencies' => array('wp-components'),
1414
),
1515
array(
@@ -18,8 +18,8 @@
1818
'dependencies' => array('wp-components'),
1919
),
2020
array(
21-
'handle' => 'wp-preferences',
22-
'path' => 'preferences/style',
21+
'handle' => 'wp-list-reusable-blocks',
22+
'path' => 'list-reusable-blocks/style',
2323
'dependencies' => array('wp-components'),
2424
),
2525
array(
@@ -33,13 +33,13 @@
3333
'dependencies' => array('wp-block-editor', 'wp-components'),
3434
),
3535
array(
36-
'handle' => 'wp-patterns',
37-
'path' => 'patterns/style',
36+
'handle' => 'wp-widgets',
37+
'path' => 'widgets/style',
3838
'dependencies' => array('wp-block-editor', 'wp-components'),
3939
),
4040
array(
41-
'handle' => 'wp-widgets',
42-
'path' => 'widgets/style',
41+
'handle' => 'wp-patterns',
42+
'path' => 'patterns/style',
4343
'dependencies' => array('wp-block-editor', 'wp-components'),
4444
),
4545
array(
@@ -77,16 +77,16 @@
7777
'path' => 'edit-widgets/style',
7878
'dependencies' => array('wp-block-editor', 'wp-block-library', 'wp-components', 'wp-media-utils', 'wp-patterns', 'wp-preferences', 'wp-widgets'),
7979
),
80-
array(
81-
'handle' => 'wp-editor',
82-
'path' => 'editor/style',
83-
'dependencies' => array('wp-block-editor', 'wp-commands', 'wp-components', 'wp-media-utils', 'wp-patterns', 'wp-preferences'),
84-
),
8580
array(
8681
'handle' => 'wp-block-library',
8782
'path' => 'block-library/style',
8883
'dependencies' => array('wp-block-editor', 'wp-components', 'wp-patterns'),
8984
),
85+
array(
86+
'handle' => 'wp-editor',
87+
'path' => 'editor/style',
88+
'dependencies' => array('wp-block-editor', 'wp-commands', 'wp-components', 'wp-media-utils', 'wp-patterns', 'wp-preferences'),
89+
),
9090
array(
9191
'handle' => 'wp-block-editor',
9292
'path' => 'block-editor/style',

wp-includes/js/dist/script-modules/index.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
'path' => 'latex-to-mathml/loader',
2323
'asset' => 'latex-to-mathml/loader.min.asset.php',
2424
),
25-
array(
26-
'id' => '@wordpress/abilities',
27-
'path' => 'abilities/index',
28-
'asset' => 'abilities/index.min.asset.php',
29-
),
3025
array(
3126
'id' => '@wordpress/interactivity-router',
3227
'path' => 'interactivity-router/index',
@@ -47,6 +42,11 @@
4742
'path' => 'core-abilities/index',
4843
'asset' => 'core-abilities/index.min.asset.php',
4944
),
45+
array(
46+
'id' => '@wordpress/abilities',
47+
'path' => 'abilities/index',
48+
'asset' => 'abilities/index.min.asset.php',
49+
),
5050
array(
5151
'id' => '@wordpress/route',
5252
'path' => 'route/index',

wp-includes/version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*
1717
* @global string $wp_version
1818
*/
19-
$wp_version = '7.0-alpha-61440';
19+
$wp_version = '7.0-alpha-61441';
2020

2121
/**
2222
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

0 commit comments

Comments
 (0)