From 868d48e773a2a6d50f6ec995425215dc7fd49363 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 26 Aug 2020 13:34:03 +0000 Subject: [PATCH] Editor: Remove some hardcoded text color values from patterns that have body text with no specific background color. This ensures that the patterns respect the theme's default color for body text and avoids contrast issues, particularly in dark themes. Props nrqsnchz, mapk, fullofcaffeine. Fixes #50892. Built from https://develop.svn.wordpress.org/trunk@48864 git-svn-id: http://core.svn.wordpress.org/trunk@48626 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-patterns/heading-paragraph.php | 2 +- wp-includes/block-patterns/text-three-columns-buttons.php | 2 +- wp-includes/block-patterns/text-two-columns-with-images.php | 2 +- wp-includes/block-patterns/text-two-columns.php | 2 +- wp-includes/version.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wp-includes/block-patterns/heading-paragraph.php b/wp-includes/block-patterns/heading-paragraph.php index 75d3c0cd69..282ddda674 100644 --- a/wp-includes/block-patterns/heading-paragraph.php +++ b/wp-includes/block-patterns/heading-paragraph.php @@ -7,7 +7,7 @@ return array( 'title' => __( 'Heading and paragraph' ), - 'content' => "\n
\n

2.
" . __( 'Which treats of the first sally the ingenious Don Quixote made from home' ) . "

\n\n\n\n

" . __( 'These preliminaries settled, he did not care to put off any longer the execution of his design, urged on to it by the thought of all the world was losing by his delay, seeing what wrongs he intended to right, grievances to redress, injustices to repair, abuses to remove, and duties to discharge.' ) . "

\n
\n", + 'content' => "\n
\n

2.
" . __( 'Which treats of the first sally the ingenious Don Quixote made from home' ) . "

\n\n\n\n

" . __( 'These preliminaries settled, he did not care to put off any longer the execution of his design, urged on to it by the thought of all the world was losing by his delay, seeing what wrongs he intended to right, grievances to redress, injustices to repair, abuses to remove, and duties to discharge.' ) . "

\n
\n", 'viewportWidth' => 1000, 'categories' => array( 'text' ), 'description' => _x( 'A heading preceded by a chapter number, and followed by a paragraph.', 'Block pattern description' ), diff --git a/wp-includes/block-patterns/text-three-columns-buttons.php b/wp-includes/block-patterns/text-three-columns-buttons.php index 5ca7a1496a..d1145a6cfd 100644 --- a/wp-includes/block-patterns/text-three-columns-buttons.php +++ b/wp-includes/block-patterns/text-three-columns-buttons.php @@ -8,7 +8,7 @@ return array( 'title' => __( 'Three columns of text with buttons' ), 'categories' => array( 'columns' ), - 'content' => "\n
\n
\n
\n

" . __( 'Which treats of the character and pursuits of the famous Don Quixote of La Mancha.' ) . "

\n\n\n\n
\n
" . __( 'Chapter One' ) . "
\n
\n
\n\n\n\n
\n

" . __( 'Which treats of the first sally the ingenious Don Quixote made from home.' ) . "

\n\n\n\n
\n
" . __( 'Chapter Two' ) . "
\n
\n
\n\n\n\n
\n

" . __( 'Wherein is related the droll way in which Don Quixote had himself dubbed a knight.' ) . "

\n\n\n\n
\n
" . __( 'Chapter Three' ) . "
\n
\n
\n
\n
\n", + 'content' => "\n
\n
\n
\n

" . __( 'Which treats of the character and pursuits of the famous Don Quixote of La Mancha.' ) . "

\n\n\n\n
\n
" . __( 'Chapter One' ) . "
\n
\n
\n\n\n\n
\n

" . __( 'Which treats of the first sally the ingenious Don Quixote made from home.' ) . "

\n\n\n\n
\n
" . __( 'Chapter Two' ) . "
\n
\n
\n\n\n\n
\n

" . __( 'Wherein is related the droll way in which Don Quixote had himself dubbed a knight.' ) . "

\n\n\n\n
\n
" . __( 'Chapter Three' ) . "
\n
\n
\n
\n
\n", 'viewportWidth' => 1000, 'description' => _x( 'Three small columns of text, each with an outlined button with rounded corners at the bottom.', 'Block pattern description' ), ); diff --git a/wp-includes/block-patterns/text-two-columns-with-images.php b/wp-includes/block-patterns/text-two-columns-with-images.php index 8ad9131167..bf72ca98e8 100644 --- a/wp-includes/block-patterns/text-two-columns-with-images.php +++ b/wp-includes/block-patterns/text-two-columns-with-images.php @@ -8,6 +8,6 @@ return array( 'title' => __( 'Two columns of text with images' ), 'categories' => array( 'columns' ), - 'content' => "\n
\n
\n
\n
\"\"/
\n\n\n\n

" . __( 'You must know, then, that the above-named gentleman whenever he was at leisure (which was mostly all the year round) gave himself up to reading books of chivalry with such ardour and avidity that he almost entirely neglected the pursuit of his field-sports, and even the management of his property; and to such a pitch did his eagerness and infatuation go that he sold many an acre of tillageland to buy books of chivalry to read, and brought home as many of them as he could get.' ) . "

\n
\n\n\n\n
\n
\"\"/
\n\n\n\n

" . __( 'But of all there were none he liked so well as those of the famous Feliciano de Silva\'s composition, for their lucidity of style and complicated conceits were as pearls in his sight, particularly when in his reading he came upon courtships and cartels, where he often found passages like "the reason of the unreason with which my reason is afflicted so weakens my reason that with reason I murmur at your beauty;" or again, "the high heavens render you deserving of the desert your greatness deserves."' ) . "

\n
\n
\n
\n", + 'content' => "\n
\n
\n
\n
\"\"/
\n\n\n\n

" . __( 'They must know, then, that the above-named gentleman whenever he was at leisure (which was mostly all the year round) gave himself up to reading books of chivalry with such ardour and avidity that he almost entirely neglected the pursuit of his field-sports, and even the management of his property; and to such a pitch did his eagerness and infatuation go that he sold many an acre of tillageland to buy books of chivalry to read, and brought home as many of them as he could get.' ) . "

\n
\n\n\n\n
\n
\"\"/
\n\n\n\n

" . __( 'But of all there were none he liked so well as those of the famous Feliciano de Silva\'s composition, for their lucidity of style and complicated conceits were as pearls in his sight, particularly when in his reading he came upon courtships and cartels, where he often found passages like "the reason of the unreason with which my reason is afflicted so weakens my reason that with reason I murmur at your beauty;" or again, "the high heavens render you deserving of the desert your greatness deserves."' ) . "

\n
\n
\n
\n", 'description' => _x( 'Two columns of text, each with an image on top.', 'Block pattern description' ), ); diff --git a/wp-includes/block-patterns/text-two-columns.php b/wp-includes/block-patterns/text-two-columns.php index 76261e4685..42d70985f7 100644 --- a/wp-includes/block-patterns/text-two-columns.php +++ b/wp-includes/block-patterns/text-two-columns.php @@ -8,6 +8,6 @@ return array( 'title' => __( 'Two columns of text' ), 'categories' => array( 'columns' ), - 'content' => "\n
\n

" . __( 'Which treats of the character and pursuits of the famous gentleman Don Quixote of La Mancha' ) . "

\n\n\n\n
\n
\n

" . __( 'In a village of La Mancha, the name of which I have no desire to call to mind, there lived not long since one of those gentlemen that keep a lance in the lance-rack, an old buckler, a lean hack, and a greyhound for coursing. An olla of rather more beef than mutton, a salad on most nights, scraps on Saturdays, lentils on Fridays, and a pigeon or so extra on Sundays, made away with three-quarters of his income.' ) . "

\n
\n\n\n\n
\n

" . __( 'The rest of it went in a doublet of fine cloth and velvet breeches and shoes to match for holidays, while on week-days he made a brave figure in his best homespun. He had in his house a housekeeper past forty, a niece under twenty, and a lad for the field and market-place, who used to saddle the hack as well as handle the bill-hook. The age of this gentleman of ours was bordering on fifty; he was of a hardy habit, spare, gaunt-featured, a very early riser and a great sportsman.' ) . "

\n
\n
\n
\n", + 'content' => "\n
\n

" . __( 'Which treats of the character and pursuits of the famous gentleman Don Quixote of La Mancha' ) . "

\n\n\n\n
\n
\n

" . __( 'In a village of La Mancha, the name of which I have no desire to call to mind, there lived not long since one of those gentlemen that keep a lance in the lance-rack, an old buckler, a lean hack, and a greyhound for coursing. An olla of rather more beef than mutton, a salad on most nights, scraps on Saturdays, lentils on Fridays, and a pigeon or so extra on Sundays, made away with three-quarters of his income.' ) . "

\n
\n\n\n\n
\n

" . __( 'The rest of it went in a doublet of fine cloth and velvet breeches and shoes to match for holidays, while on week-days he made a brave figure in his best homespun. He had in his house a housekeeper past forty, a niece under twenty, and a lad for the field and market-place, who used to saddle the hack as well as handle the bill-hook. The age of this gentleman of ours was bordering on fifty; he was of a hardy habit, spare, gaunt-featured, a very early riser and a great sportsman.' ) . "

\n
\n
\n
\n", 'description' => _x( 'Two columns of text preceded by a long heading.', 'Block pattern description' ), ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 99988137c9..fbc5b051a9 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.6-alpha-48862'; +$wp_version = '5.6-alpha-48864'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.