diff --git a/wp-includes/block-patterns.php b/wp-includes/block-patterns.php index f5e7ee4e16..128775e937 100644 --- a/wp-includes/block-patterns.php +++ b/wp-includes/block-patterns.php @@ -19,16 +19,21 @@ function _register_core_block_patterns_and_categories() { if ( $should_register_core_patterns ) { $core_block_patterns = array( - 'text-two-columns', - 'two-buttons', - 'two-images', - 'text-two-columns-with-images', - 'text-three-columns-buttons', - 'large-header', - 'large-header-button', - 'three-buttons', - 'heading-paragraph', + 'media-text-nature', + 'two-images-gallery', + 'three-columns-media-text', 'quote', + 'large-header-left', + 'large-header-text-button', + 'media-text-art', + 'text-two-columns-title', + 'three-columns-text', + 'text-two-columns-title-offset', + 'heading', + 'three-images-gallery', + 'text-two-columns', + 'media-text-arquitecture', + 'two-buttons', ); foreach ( $core_block_patterns as $core_block_pattern ) { diff --git a/wp-includes/block-patterns/heading-paragraph.php b/wp-includes/block-patterns/heading-paragraph.php deleted file mode 100644 index 282ddda674..0000000000 --- a/wp-includes/block-patterns/heading-paragraph.php +++ /dev/null @@ -1,14 +0,0 @@ - __( '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", - '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/heading.php b/wp-includes/block-patterns/heading.php new file mode 100644 index 0000000000..9a3e9f96ac --- /dev/null +++ b/wp-includes/block-patterns/heading.php @@ -0,0 +1,16 @@ + _x( 'Heading', 'Block pattern title' ), + 'categories' => array( 'text' ), + 'blockTypes' => array( 'core/heading' ), + 'content' => ' +

' . esc_html__( "We're a studio in Berlin with an international practice in architecture, urban planning and interior design. We believe in sharing knowledge and promoting dialogue to increase the creative potential of collaboration." ) . '

+ ', + 'description' => _x( 'Heading text', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/large-header-button.php b/wp-includes/block-patterns/large-header-button.php deleted file mode 100644 index 313dc26b47..0000000000 --- a/wp-includes/block-patterns/large-header-button.php +++ /dev/null @@ -1,14 +0,0 @@ - __( 'Large header with a heading and a button ' ), - 'content' => "\n
\n
\n
\n
\n
\n\n\n\n
\n
\n\n\n\n

" . __( 'Thou hast seen
nothing yet' ) . "

\n\n\n\n\n\n\n\n
\n
\n\n\n\n
\n
\n
\n
\n
\n", - 'viewportWidth' => 1000, - 'categories' => array( 'header' ), - 'description' => _x( 'A large hero section with a bright gradient background, a big heading and a filled button.', 'Block pattern description' ), -); diff --git a/wp-includes/block-patterns/large-header-left.php b/wp-includes/block-patterns/large-header-left.php new file mode 100644 index 0000000000..cdaca2277a --- /dev/null +++ b/wp-includes/block-patterns/large-header-left.php @@ -0,0 +1,33 @@ + _x( 'Large header with left-aligned text', 'Block pattern title' ), + 'categories' => array( 'header' ), + 'content' => ' +
+

' . esc_html__( 'Forest.' ) . '

+ + + +
+
+ + + + +

' . esc_html__( 'Even a child knows how valuable the forest is. The fresh, breathtaking smell of trees. Echoing birds flying above that dense magnitude. A stable climate, a sustainable diverse life and a source of culture. Yet, forests and other ecosystems hang in the balance, threatened to become croplands, pasture, and plantations.' ) . '

+
+ + + +
+
+
+ ', + 'description' => _x( 'Cover image with quote on top', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/large-header-text-button.php b/wp-includes/block-patterns/large-header-text-button.php new file mode 100644 index 0000000000..ce39071f4a --- /dev/null +++ b/wp-includes/block-patterns/large-header-text-button.php @@ -0,0 +1,35 @@ + _x( 'Large header with text and a button.', 'Block pattern title' ), + 'categories' => array( 'header' ), + 'content' => ' +
+

' . esc_html__( 'Overseas:' ) . '
' . esc_html__( '1500 — 1960' ) . '

+ + + +
+
+

' . wp_kses_post( __( 'An exhibition about the different representations of the ocean throughout time, between the sixteenth and the twentieth century. Taking place in our Open Room in Floor 2.' ) ) . '

+ + + + +
+ + + +
+
+
+ ', + 'description' => _x( 'Large header with background image and text and button on top', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/large-header.php b/wp-includes/block-patterns/large-header.php deleted file mode 100644 index ee681e880a..0000000000 --- a/wp-includes/block-patterns/large-header.php +++ /dev/null @@ -1,14 +0,0 @@ - __( 'Large header with a heading' ), - 'content' => "\n
\n

" . __( 'Don Quixote' ) . "

\n
\n", - 'viewportWidth' => 1000, - 'categories' => array( 'header' ), - 'description' => _x( 'A large hero section with an example background image and a heading in the center.', 'Block pattern description' ), -); diff --git a/wp-includes/block-patterns/media-text-arquitecture.php b/wp-includes/block-patterns/media-text-arquitecture.php new file mode 100644 index 0000000000..41f93e7b09 --- /dev/null +++ b/wp-includes/block-patterns/media-text-arquitecture.php @@ -0,0 +1,21 @@ + _x( 'Media and text with image on the right', 'Block pattern title' ), + 'categories' => array( 'header' ), + 'content' => ' +
' . esc_attr__( 'Close-up, abstract view of architecture.' ) . '
+

' . esc_html__( 'Open Spaces' ) . '

+ + + +

' . esc_html__( 'See case study ↗' ) . '

+
+ ', + 'description' => _x( 'Media and text block with image to the left and text to the right', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/media-text-art.php b/wp-includes/block-patterns/media-text-art.php new file mode 100644 index 0000000000..df84da11ce --- /dev/null +++ b/wp-includes/block-patterns/media-text-art.php @@ -0,0 +1,21 @@ + _x( 'Media & text with image on the right', 'Block pattern title' ), + 'categories' => array( 'header' ), + 'content' => ' +
' . esc_attr__( 'A green and brown rural landscape leading into a bright blue ocean and slightly cloudy sky, done in oil paints.' ) . '
+

' . esc_html__( 'Shore with Blue Sea' ) . '

+ + + +

' . esc_html__( 'Eleanor Harris (American, 1901-1942)' ) . '

+
+ ', + 'description' => _x( 'Media and text block with image to the right and text to the left', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/media-text-nature.php b/wp-includes/block-patterns/media-text-nature.php new file mode 100644 index 0000000000..7efd0cbdec --- /dev/null +++ b/wp-includes/block-patterns/media-text-nature.php @@ -0,0 +1,28 @@ + _x( 'Media & text in a full height container', 'Block pattern title' ), + 'categories' => array( 'header' ), + 'content' => ' +
+
' . esc_attr__( 'Close-up of dried, cracked earth.' ) . '
+

' . esc_html__( "What's the problem?" ) . '

+ + + +

' . esc_html__( 'Trees are more important today than ever before. More than 10,000 products are reportedly made from trees. Through chemistry, the humble woodpile is yielding chemicals, plastics and fabrics that were beyond comprehension when an axe first felled a Texas tree.' ) . '

+ + + +
+
+ ', + 'description' => _x( 'Media and text block with image to the left and text and button to the right', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/quote.php b/wp-includes/block-patterns/quote.php index d8fc0e9e88..039454330e 100644 --- a/wp-includes/block-patterns/quote.php +++ b/wp-includes/block-patterns/quote.php @@ -1,14 +1,30 @@ __( 'Quote' ), - 'content' => "\n
\n
\""
\n\n\n\n

" . __( '"Do you see over yonder, friend Sancho, thirty or forty hulking giants? I intend to do battle with them and slay them."' ) . '

' . __( '— Don Quixote' ) . "
\n\n\n\n
\n
\n", - 'viewportWidth' => 800, - 'categories' => array( 'text' ), - 'description' => _x( 'A quote and citation with an image above, and a separator at the bottom.', 'Block pattern description' ), + 'title' => _x( 'Quote', 'Block pattern title' ), + 'categories' => array( 'text' ), + 'blockTypes' => array( 'core/quote' ), + 'content' => ' +
+
+ + + +
' . esc_attr__( 'A side profile of a woman in a russet-colored turtleneck and white bag. She looks up with her eyes closed.' ) . '
+ + + +

' . esc_html__( "\"Contributing makes me feel like I'm being useful to the planet.\"" ) . '

' . wp_kses_post( __( '— Anna Wong, Volunteer' ) ) . '
+ + + +
+
+ ', + 'description' => _x( 'Testimonial quote with portrait', '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 deleted file mode 100644 index d1145a6cfd..0000000000 --- a/wp-includes/block-patterns/text-three-columns-buttons.php +++ /dev/null @@ -1,14 +0,0 @@ - __( '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
\n\n\n\n
\n

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

\n\n\n\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
\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-title-offset.php b/wp-includes/block-patterns/text-two-columns-title-offset.php new file mode 100644 index 0000000000..00d1404d77 --- /dev/null +++ b/wp-includes/block-patterns/text-two-columns-title-offset.php @@ -0,0 +1,53 @@ + _x( 'Two columns of text with offset heading', 'Block pattern title' ), + 'categories' => array( 'columns', 'text' ), + 'content' => ' +
+ + + + +
+
+

' . esc_html__( 'Oceanic Inspiration' ) . '

+
+ + + +
+
+
+
+ + + +
+
+ + + +
+

' . esc_html__( 'Winding veils round their heads, the women walked on deck. They were now moving steadily down the river, passing the dark shapes of ships at anchor, and London was a swarm of lights with a pale yellow canopy drooping above it. There were the lights of the great theatres, the lights of the long streets, lights that indicated huge squares of domestic comfort, lights that hung high in air.' ) . '

+
+ + + +
+

' . esc_html__( 'No darkness would ever settle upon those lamps, as no darkness had settled upon them for hundreds of years. It seemed dreadful that the town should blaze for ever in the same spot; dreadful at least to people going away to adventure upon the sea, and beholding it as a circumscribed mound, eternally burnt, eternally scarred. From the deck of the ship the great city appeared a crouched and cowardly figure, a sedentary miser.' ) . '

+
+
+ + + + +
+ ', + 'description' => _x( 'Two columns of text with offset heading', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/text-two-columns-title.php b/wp-includes/block-patterns/text-two-columns-title.php new file mode 100644 index 0000000000..dc155c9926 --- /dev/null +++ b/wp-includes/block-patterns/text-two-columns-title.php @@ -0,0 +1,31 @@ + _x( 'Two columns text and title', 'Block pattern title' ), + 'categories' => array( 'columns', 'text' ), + 'content' => ' +
+

' . esc_html__( 'The voyage had begun, and had begun happily with a soft blue sky, and a calm sea.' ) . '

+ + + +
+
+

' . esc_html__( 'They followed her on to the deck. All the smoke and the houses had disappeared, and the ship was out in a wide space of sea very fresh and clear though pale in the early light. They had left London sitting on its mud. A very thin line of shadow tapered on the horizon, scarcely thick enough to stand the burden of Paris, which nevertheless rested upon it. They were free of roads, free of mankind, and the same exhilaration at their freedom ran through them all.' ) . '

+
+ + + +
+

' . esc_html__( "The ship was making her way steadily through small waves which slapped her and then fizzled like effervescing water, leaving a little border of bubbles and foam on either side. The colourless October sky above was thinly clouded as if by the trail of wood-fire smoke, and the air was wonderfully salt and brisk. Indeed it was too cold to stand still. Mrs. Ambrose drew her arm within her husband's, and as they moved off it could be seen from the way in which her sloping cheek turned up to his that she had something private to communicate." ) . '

+
+
+
+ ', + 'description' => _x( 'Two columns text and title', '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 deleted file mode 100644 index bf72ca98e8..0000000000 --- a/wp-includes/block-patterns/text-two-columns-with-images.php +++ /dev/null @@ -1,13 +0,0 @@ - __( 'Two columns of text with images' ), - 'categories' => array( 'columns' ), - '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 42d70985f7..b1d0abd184 100644 --- a/wp-includes/block-patterns/text-two-columns.php +++ b/wp-includes/block-patterns/text-two-columns.php @@ -1,13 +1,44 @@ __( '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", - 'description' => _x( 'Two columns of text preceded by a long heading.', 'Block pattern description' ), + 'title' => _x( 'Two columns of text', 'Block pattern title' ), + 'categories' => array( 'columns', 'text' ), + 'content' => ' +
+
+ + + +

' . esc_html__( 'We have worked with:' ) . '

+ + + +

' . wp_kses_post( __( 'EARTHFUND™
ARCHWEEKLY
FUTURE ROADS
BUILDING NY' ) ) . '

+ + + + +
+ + + +
+ + + + +

' . wp_kses_post( __( 'DUBAI ROOFS
MAY WATSON STUDIO
Y.O.L
RUDIMENTAR' ) ) . '

+ + + + +
+
+ ', + 'description' => _x( 'Two columns of text', 'Block pattern description' ), ); diff --git a/wp-includes/block-patterns/three-buttons.php b/wp-includes/block-patterns/three-buttons.php deleted file mode 100644 index 96f750628b..0000000000 --- a/wp-includes/block-patterns/three-buttons.php +++ /dev/null @@ -1,14 +0,0 @@ - __( 'Three buttons' ), - 'content' => "\n
\n
" . __( 'About Cervantes' ) . "
\n\n\n\n
" . __( 'Contact us' ) . "
\n\n\n\n
" . __( 'Books' ) . "
\n
\n", - 'viewportWidth' => 600, - 'categories' => array( 'buttons' ), - 'description' => _x( 'Three filled buttons with rounded corners, side by side.', 'Block pattern description' ), -); diff --git a/wp-includes/block-patterns/three-columns-media-text.php b/wp-includes/block-patterns/three-columns-media-text.php new file mode 100644 index 0000000000..758b6ab6b7 --- /dev/null +++ b/wp-includes/block-patterns/three-columns-media-text.php @@ -0,0 +1,69 @@ + _x( 'Three columns with images and text', 'Block pattern title' ), + 'categories' => array( 'columns' ), + 'content' => ' +
+
+
+ + + + +
' . esc_html__( 'ECOLOGY' ) . '
+ + + +

' . esc_html__( 'Natural resources.' ) . '

+ + +
+
+ + + +
+
+

' . wp_kses_post( __( 'Nature, in the common sense, refers to essences unchanged by man; space, the air, the river, the leaf. Art is applied to the mixture of his will with the same things, as in a house, a canal, a statue, a picture. But his operations taken together are so insignificant, a little chipping, baking, patching, and washing, that in an impression so grand as that of the world on the human mind, they do not vary the result.' ) ) . '

+
+ + + +
+ + + + +
' . esc_attr__( 'The sun setting through a dense forest of trees.' ) . '
+
+ + + +
+
' . esc_attr__( 'Wind turbines standing on a grassy plain, against a blue sky.' ) . '
+
+
+ + + +
+
+
' . esc_attr__( 'The sun shining over a ridge leading down into the shore. In the distance, a car drives down a road.' ) . '
+
+ + + +
+

' . esc_html__( "Undoubtedly we have no questions to ask which are unanswerable. We must trust the perfection of the creation so far, as to believe that whatever curiosity the order of things has awakened in our minds, the order of things can satisfy. Every man's condition is a solution in hieroglyphic to those inquiries he would put." ) . '

+
+
+
+ ', + 'description' => _x( 'Three columns with images and text', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/three-columns-text.php b/wp-includes/block-patterns/three-columns-text.php new file mode 100644 index 0000000000..bdd8c0331d --- /dev/null +++ b/wp-includes/block-patterns/three-columns-text.php @@ -0,0 +1,43 @@ + _x( 'Three columns of text', 'Block pattern title' ), + 'categories' => array( 'columns', 'text' ), + 'content' => ' +
+
+

' . esc_html__( 'Virtual Tour ↗' ) . '

+ + + +

' . esc_html__( 'Get a virtual tour of the museum. Ideal for schools and events.' ) . '

+
+ + + +
+

' . esc_html__( 'Current Shows ↗' ) . '

+ + + +

' . esc_html__( 'Stay updated and see our current exhibitions here.' ) . '

+
+ + + +
+

' . esc_html__( 'Useful Info ↗' ) . '

+ + + +

' . esc_html__( 'Get to know our opening times, ticket prices and discounts.' ) . '

+
+
+ ', + 'description' => _x( 'Three columns of text', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/three-images-gallery.php b/wp-includes/block-patterns/three-images-gallery.php new file mode 100644 index 0000000000..c8f059fe09 --- /dev/null +++ b/wp-includes/block-patterns/three-images-gallery.php @@ -0,0 +1,43 @@ + _x( 'Three columns with offset images', 'Block pattern title' ), + 'categories' => array( 'gallery' ), + 'content' => ' +
+
+
' . esc_attr__( 'Close-up, abstract view of geometric architecture.' ) . '
+
+ + + +
+ + + + + + + + +
' . esc_attr__( 'Close-up, angled view of a window on a white building.' ) . '
+
+ + + +
+
' . esc_attr__( 'Close-up of the corner of a white, geometric building with both sharp points and round corners.' ) . '
+ + + + +
+
+ ', + 'description' => _x( 'Three columns with offset images', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/two-buttons.php b/wp-includes/block-patterns/two-buttons.php index e9e5fee439..d75490aa44 100644 --- a/wp-includes/block-patterns/two-buttons.php +++ b/wp-includes/block-patterns/two-buttons.php @@ -6,8 +6,16 @@ */ return array( - 'title' => __( 'Two buttons' ), - 'content' => "\n
\n
" . __( 'Download now' ) . "
\n\n\n\n
" . __( 'About Cervantes' ) . "
\n
\n", + 'title' => _x( 'Two buttons', 'Block pattern title' ), + 'content' => ' +
+
' . esc_html__( 'Our Work' ) . '
+ + + +
' . esc_html__( 'Where We Are' ) . '
+
+ ', 'viewportWidth' => 500, 'categories' => array( 'buttons' ), 'description' => _x( 'Two buttons, one filled and one outlined, side by side.', 'Block pattern description' ), diff --git a/wp-includes/block-patterns/two-images-gallery.php b/wp-includes/block-patterns/two-images-gallery.php new file mode 100644 index 0000000000..dd29b19370 --- /dev/null +++ b/wp-includes/block-patterns/two-images-gallery.php @@ -0,0 +1,15 @@ + _x( 'Two images side by side', 'Block pattern title' ), + 'categories' => array( 'gallery' ), + 'content' => ' + + ', + 'description' => _x( 'Two images side by side', 'Block pattern description' ), +); diff --git a/wp-includes/block-patterns/two-images.php b/wp-includes/block-patterns/two-images.php deleted file mode 100644 index 94fba4fb8c..0000000000 --- a/wp-includes/block-patterns/two-images.php +++ /dev/null @@ -1,13 +0,0 @@ - __( 'Two images side by side' ), - 'categories' => array( 'gallery' ), - 'description' => _x( 'An image gallery with two example images.', 'Block pattern description' ), - 'content' => "\n\n", -); diff --git a/wp-includes/version.php b/wp-includes/version.php index 4ec6f8d22b..e98f154edc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.8-alpha-50793'; +$wp_version = '5.8-alpha-50794'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.