From 244f676c59ed0bedd9c7d067049c62685b2852fd Mon Sep 17 00:00:00 2001 From: hellofromTonya Date: Tue, 17 Oct 2023 02:14:24 +0000 Subject: [PATCH] Twenty Twenty-Four: Bugfixes for 6.4 RC1. Resyncing changes for TT4 into Core. Changes include: * Reformatted all the patterns for readability. * Bugfixes in the markup and improvements on the string translation functions. * Renaming of some patterns, making them consistent with the content they show and whether they are simple patterns, full-page patterns or patterns meant to replace templates. Follow-up to [56813], [56764], [56716]. Props richtabor, onemaggie, luminuu, shailu25, dunhakdis, shivashankerbhatta, dajeema, enodekciw, kafleg, viralsampat, glendaviesnz, beafialho, webmandesign, huzaifaalmesbah, gregfuller, benharri. Fixes #59640. Built from https://develop.svn.wordpress.org/trunk@56951 git-svn-id: http://core.svn.wordpress.org/trunk@56462 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../themes/twentytwentyfour/functions.php | 28 +- .../parts/footer-portfolio.html | 1 - .../twentytwentyfour/parts/footer-writer.html | 1 - .../themes/twentytwentyfour/parts/header.html | 27 +- .../twentytwentyfour/parts/post-meta.html | 2 +- .../twentytwentyfour/parts/sidebar.html | 2 +- .../twentytwentyfour/patterns/banner-hero.php | 55 ++++ .../patterns/banner-project-description.php | 44 +++ .../patterns/centered-statement.php | 25 -- .../twentytwentyfour/patterns/clients.php | 50 ---- .../twentytwentyfour/patterns/columns.php | 64 ----- .../patterns/cta-content-image-on-right.php | 66 +++++ .../twentytwentyfour/patterns/cta-pricing.php | 214 ++++++++++++++ .../twentytwentyfour/patterns/cta-rsvp.php | 57 ++++ .../patterns/cta-services-image-left.php | 48 ++++ ...bscribe.php => cta-subscribe-centered.php} | 19 +- .../themes/twentytwentyfour/patterns/faq.php | 54 ---- .../patterns/feature-grid.php | 103 ------- .../patterns/features-with-images.php | 100 ------- ...riter.php => footer-centered-logo-nav.php} | 19 +- ...ortfolio.php => footer-colophon-3-col.php} | 30 +- .../twentytwentyfour/patterns/footer.php | 196 +++++++------ ...mage.php => gallery-full-screen-image.php} | 21 +- .../gallery-offset-images-grid-2-col.php | 58 ++++ .../gallery-offset-images-grid-3-col.php | 110 +++++++ .../gallery-offset-images-grid-4-col.php | 149 ++++++++++ .../patterns/gallery-project-layout.php | 65 +++++ .../themes/twentytwentyfour/patterns/hero.php | 42 --- .../twentytwentyfour/patterns/hidden-404.php | 8 +- .../patterns/hidden-comments.php | 48 ++-- .../hidden-hidden-intro-text-left.php | 29 -- ...ults-content.php => hidden-no-results.php} | 4 +- .../patterns/hidden-portfolio-hero.php | 19 ++ .../patterns/hidden-post-meta.php | 31 +- .../patterns/hidden-post-navigation.php | 12 +- .../patterns/hidden-search.php | 4 +- .../patterns/hidden-sidebar.php | 121 ++++---- .../patterns/left-aligned-cta-image.php | 48 ---- .../patterns/offset-grid-image-posts.php | 59 ---- .../patterns/page-01-business-home.php | 18 -- .../patterns/page-02-business-about.php | 19 -- .../patterns/page-03-portfolio-overview.php | 17 -- .../patterns/page-04-newsletter-landing.php | 37 --- .../patterns/page-05-portfolio-home.php | 14 - .../patterns/page-06-writer-home.php | 71 ----- .../patterns/page-07-rsvp-landing.php | 46 --- .../patterns/page-about-business.php | 19 ++ .../patterns/page-home-blogging.php | 83 ++++++ .../patterns/page-home-business.php | 18 ++ .../patterns/page-home-portfolio-gallery.php | 14 + .../patterns/page-home-portfolio.php | 14 + .../patterns/page-newsletter-landing.php | 47 +++ .../patterns/page-portfolio-overview.php | 17 ++ .../patterns/page-rsvp-landing.php | 56 ++++ .../{posts-one-column.php => posts-1-col.php} | 31 +- ...osts-three-columns.php => posts-3-col.php} | 28 +- .../patterns/posts-featured.php | 64 ----- .../patterns/posts-grid-2-col.php | 80 ++++++ ...images.php => posts-images-only-3-col.php} | 9 +- .../posts-images-only-offset-4-col.php | 83 ++++++ .../twentytwentyfour/patterns/pricing.php | 166 ----------- .../patterns/project-description.php | 35 --- .../patterns/project-details.php | 42 --- .../patterns/project-layout.php | 46 --- .../patterns/services-cta.php | 34 --- .../twentytwentyfour/patterns/team-4-col.php | 129 +++++++++ .../themes/twentytwentyfour/patterns/team.php | 90 ------ .../patterns/template-archive-blogging.php | 21 ++ .../patterns/template-archive-portfolio.php | 6 +- .../patterns/template-archive-writer.php | 24 -- ...-writer.php => template-home-blogging.php} | 10 +- .../patterns/template-home-business.php | 6 +- .../patterns/template-home-portfolio.php | 10 +- .../patterns/template-index-blogging.php | 23 ++ .../patterns/template-index-portfolio.php | 7 +- .../patterns/template-index-writer.php | 26 -- .../patterns/template-search-portfolio.php | 27 +- .../patterns/template-search-writer.php | 15 +- .../patterns/template-single-portfolio.php | 17 +- .../patterns/testimonial-centered.php | 51 ++-- .../patterns/text-alternating-images.php | 115 ++++++++ .../text-centered-statement-small.php | 30 ++ .../patterns/text-centered-statement.php | 29 ++ .../patterns/text-centered-title.php | 26 -- .../twentytwentyfour/patterns/text-faq.php | 65 +++++ .../patterns/text-feature-grid-3-col.php | 118 ++++++++ .../patterns/text-project-details.php | 53 ++++ .../patterns/text-title-left-image-right.php | 70 +++-- .../themes/twentytwentyfour/styles/ember.json | 254 ++++++++++++++++ .../twentytwentyfour/styles/fossil.json | 92 +++++- .../themes/twentytwentyfour/styles/ice.json | 271 ++++++++++++++++-- .../twentytwentyfour/styles/maelstrom.json | 210 ++++++++++++++ .../themes/twentytwentyfour/styles/mint.json | 10 + .../themes/twentytwentyfour/styles/rust.json | 68 ++--- .../twentytwentyfour/styles/sandstorm.json | 241 ---------------- .../twentytwentyfour/templates/404.html | 4 +- .../twentytwentyfour/templates/archive.html | 4 +- .../twentytwentyfour/templates/index.html | 4 +- .../templates/page-no-title.html | 4 +- .../twentytwentyfour/templates/page-wide.html | 40 ++- .../templates/page-with-sidebar.html | 39 +-- .../twentytwentyfour/templates/page.html | 10 +- .../twentytwentyfour/templates/search.html | 27 +- .../templates/single-with-sidebar.html | 87 +++--- .../twentytwentyfour/templates/single.html | 65 +++-- wp-content/themes/twentytwentyfour/theme.json | 99 +++---- wp-includes/version.php | 2 +- 107 files changed, 3397 insertions(+), 2243 deletions(-) delete mode 100644 wp-content/themes/twentytwentyfour/parts/footer-portfolio.html delete mode 100644 wp-content/themes/twentytwentyfour/parts/footer-writer.html create mode 100644 wp-content/themes/twentytwentyfour/patterns/banner-hero.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/banner-project-description.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/centered-statement.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/clients.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/columns.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/cta-pricing.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php rename wp-content/themes/twentytwentyfour/patterns/{text-centered-cta-subscribe.php => cta-subscribe-centered.php} (58%) delete mode 100644 wp-content/themes/twentytwentyfour/patterns/faq.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/feature-grid.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/features-with-images.php rename wp-content/themes/twentytwentyfour/patterns/{footer-writer.php => footer-centered-logo-nav.php} (54%) rename wp-content/themes/twentytwentyfour/patterns/{footer-portfolio.php => footer-colophon-3-col.php} (83%) rename wp-content/themes/twentytwentyfour/patterns/{hidden-full-screen-image.php => gallery-full-screen-image.php} (51%) create mode 100644 wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/hero.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php rename wp-content/themes/twentytwentyfour/patterns/{hidden-no-results-content.php => hidden-no-results.php} (73%) create mode 100644 wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/left-aligned-cta-image.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/offset-grid-image-posts.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/page-01-business-home.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/page-02-business-about.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/page-03-portfolio-overview.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/page-04-newsletter-landing.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/page-05-portfolio-home.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/page-06-writer-home.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/page-07-rsvp-landing.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-about-business.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-home-blogging.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-home-business.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-home-portfolio-gallery.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-home-portfolio.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-newsletter-landing.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-portfolio-overview.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/page-rsvp-landing.php rename wp-content/themes/twentytwentyfour/patterns/{posts-one-column.php => posts-1-col.php} (57%) rename wp-content/themes/twentytwentyfour/patterns/{posts-three-columns.php => posts-3-col.php} (54%) delete mode 100644 wp-content/themes/twentytwentyfour/patterns/posts-featured.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/posts-grid-2-col.php rename wp-content/themes/twentytwentyfour/patterns/{posts-three-columns-images.php => posts-images-only-3-col.php} (76%) create mode 100644 wp-content/themes/twentytwentyfour/patterns/posts-images-only-offset-4-col.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/pricing.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/project-description.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/project-details.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/project-layout.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/services-cta.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/team-4-col.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/team.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/template-archive-blogging.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/template-archive-writer.php rename wp-content/themes/twentytwentyfour/patterns/{template-home-writer.php => template-home-blogging.php} (64%) create mode 100644 wp-content/themes/twentytwentyfour/patterns/template-index-blogging.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/template-index-writer.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/text-alternating-images.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/text-centered-statement-small.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/text-centered-statement.php delete mode 100644 wp-content/themes/twentytwentyfour/patterns/text-centered-title.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/text-faq.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/text-feature-grid-3-col.php create mode 100644 wp-content/themes/twentytwentyfour/patterns/text-project-details.php create mode 100644 wp-content/themes/twentytwentyfour/styles/ember.json create mode 100644 wp-content/themes/twentytwentyfour/styles/maelstrom.json delete mode 100644 wp-content/themes/twentytwentyfour/styles/sandstorm.json diff --git a/wp-content/themes/twentytwentyfour/functions.php b/wp-content/themes/twentytwentyfour/functions.php index e569d5b8e9..a7c7ad1975 100644 --- a/wp-content/themes/twentytwentyfour/functions.php +++ b/wp-content/themes/twentytwentyfour/functions.php @@ -9,7 +9,7 @@ */ /** - * Register block Styles + * Register block styles */ if ( ! function_exists( 'twentytwentyfour_block_styles' ) ) : @@ -165,3 +165,29 @@ if ( ! function_exists( 'twentytwentyfour_block_styles' ) ) : endif; add_action( 'init', 'twentytwentyfour_block_styles' ); + +/** + * Register pattern categories. + */ + +if ( ! function_exists( 'twentytwentyfour_pattern_categories' ) ) : + /** + * Register pattern categories + * + * @return void + * @since Twenty Twenty-Four 1.0 + * + */ + function twentytwentyfour_pattern_categories() { + + register_block_pattern_category( + 'page', + array( + 'label' => _x( 'Pages', 'Block pattern category' ), + 'description' => __( 'A collection of full page layouts.' ), + ) + ); + } +endif; + +add_action( 'init', 'twentytwentyfour_pattern_categories' ); diff --git a/wp-content/themes/twentytwentyfour/parts/footer-portfolio.html b/wp-content/themes/twentytwentyfour/parts/footer-portfolio.html deleted file mode 100644 index 32a1b81707..0000000000 --- a/wp-content/themes/twentytwentyfour/parts/footer-portfolio.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/wp-content/themes/twentytwentyfour/parts/footer-writer.html b/wp-content/themes/twentytwentyfour/parts/footer-writer.html deleted file mode 100644 index 3fa3da456b..0000000000 --- a/wp-content/themes/twentytwentyfour/parts/footer-writer.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/wp-content/themes/twentytwentyfour/parts/header.html b/wp-content/themes/twentytwentyfour/parts/header.html index 422ad31d7f..632900cbf3 100644 --- a/wp-content/themes/twentytwentyfour/parts/header.html +++ b/wp-content/themes/twentytwentyfour/parts/header.html @@ -1,13 +1,22 @@ -
-
-
+
+ +
+ +
+ - -
-
- + +
+ +
+ +
+ -
-
+ +
+
+ \ No newline at end of file diff --git a/wp-content/themes/twentytwentyfour/parts/post-meta.html b/wp-content/themes/twentytwentyfour/parts/post-meta.html index 3cdabd84c2..e11eda30ea 100644 --- a/wp-content/themes/twentytwentyfour/parts/post-meta.html +++ b/wp-content/themes/twentytwentyfour/parts/post-meta.html @@ -1 +1 @@ - \ No newline at end of file + diff --git a/wp-content/themes/twentytwentyfour/parts/sidebar.html b/wp-content/themes/twentytwentyfour/parts/sidebar.html index 2394b856a4..93c36b957c 100644 --- a/wp-content/themes/twentytwentyfour/parts/sidebar.html +++ b/wp-content/themes/twentytwentyfour/parts/sidebar.html @@ -1 +1 @@ - \ No newline at end of file + diff --git a/wp-content/themes/twentytwentyfour/patterns/banner-hero.php b/wp-content/themes/twentytwentyfour/patterns/banner-hero.php new file mode 100644 index 0000000000..4587ac86a6 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/banner-hero.php @@ -0,0 +1,55 @@ + + + +
+ + +
+ + +

+ + + + + + + +

+ + + + + + + +
+ +
+ +
+ +
+ +
+ + + + + + + +
+ <?php esc_attr_e( 'Building exterior in Toronto, Canada', 'twentytwentyfour' ); ?> +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/banner-project-description.php b/wp-content/themes/twentytwentyfour/patterns/banner-project-description.php new file mode 100644 index 0000000000..31a44fc6a6 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/banner-project-description.php @@ -0,0 +1,44 @@ + + +
+ +
+ +
+ +

+ +
+ + + +
+ + +

+ + +
+ +
+ + + + + + + +
+ <?php esc_attr_e( 'Hyatt Regency San Francisco, San Francisco, United States', 'twentytwentyfour' ); ?> +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/centered-statement.php b/wp-content/themes/twentytwentyfour/patterns/centered-statement.php deleted file mode 100644 index 5637bdf14d..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/centered-statement.php +++ /dev/null @@ -1,25 +0,0 @@ - - - -
-
- - - - -

Études is not confined to the past—we are passionate about the cutting edge designs shaping our world today.', 'twentytwentyfour' ) ); ?>

- - - - -
-
- diff --git a/wp-content/themes/twentytwentyfour/patterns/clients.php b/wp-content/themes/twentytwentyfour/patterns/clients.php deleted file mode 100644 index e24572710b..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/clients.php +++ /dev/null @@ -1,50 +0,0 @@ - - - -
- -
- -

- - - - - - - -
- - -
- - - -
- - - -
- - - -
- - - -
- - - -
-
-
- diff --git a/wp-content/themes/twentytwentyfour/patterns/columns.php b/wp-content/themes/twentytwentyfour/patterns/columns.php deleted file mode 100644 index 913a467dc3..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/columns.php +++ /dev/null @@ -1,64 +0,0 @@ - - - -
-
-
-

-
- - - -
-
-
-

- - - -

-
- - - -
-

- - - -

-
-
- - - -
-
-

- - - -

-
- - - -
-

- - - -

-
-
-
-
-
- diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php b/wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php new file mode 100644 index 0000000000..f46ecbc1d6 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/cta-content-image-on-right.php @@ -0,0 +1,66 @@ + + + +
+ +
+ +
+ +

+ + + +
    + +
  • + + + +
  • + + + +
  • + +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+ +
+ + + +
+ +
+ <?php esc_attr_e( 'White abstract geometric artwork from Dresden, Germany', 'twentytwentyfour' ); ?> +
+ +
+ +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php b/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php new file mode 100644 index 0000000000..78665ceb97 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/cta-pricing.php @@ -0,0 +1,214 @@ + + + +
+ +
+ +
+ +

+ + + +

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

+ +

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

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

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

+ +

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

Études Articles per month.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

+ + + +
+ + + +

+ + + +
+ + + +

Études app for iOS and Android.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

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

+ +

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

Études Articles.', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

+ + + +
+ + + +

+ + + +
+ + + +

Études app for iOS and Android', 'Feature for pricing level', 'twentytwentyfour' ) ); ?>

+ +
+ + + + + + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php b/wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php new file mode 100644 index 0000000000..998106589e --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/cta-rsvp.php @@ -0,0 +1,57 @@ + + + +
+ +
+ +
+ +
+ + +

+ + + +
+ +

+ + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ + + +
+ +
+ <?php esc_attr_e( 'A ramp along a curved wall in the Kiasma Museu, Helsinki, Finland', 'twentytwentyfour' ); ?> +
+ +
+ +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php b/wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php new file mode 100644 index 0000000000..0ceed99ab6 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/cta-services-image-left.php @@ -0,0 +1,48 @@ + + + +
+ +
+ +
+ +
+ <?php esc_attr_e( 'White abstract geometric artwork from Dresden, Germany', 'twentytwentyfour' ); ?> +
+ +
+ + + +
+ +

+ + + +

+ + + +
+ +
+ +
+ +
+ +
+ +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/text-centered-cta-subscribe.php b/wp-content/themes/twentytwentyfour/patterns/cta-subscribe-centered.php similarity index 58% rename from wp-content/themes/twentytwentyfour/patterns/text-centered-cta-subscribe.php rename to wp-content/themes/twentytwentyfour/patterns/cta-subscribe-centered.php index 654e6c9c0b..b65eac5907 100644 --- a/wp-content/themes/twentytwentyfour/patterns/text-centered-cta-subscribe.php +++ b/wp-content/themes/twentytwentyfour/patterns/cta-subscribe-centered.php @@ -1,15 +1,17 @@ - -
-
+ +
+ +
+ @@ -22,8 +24,11 @@ -
-
+
+ +
+ +
diff --git a/wp-content/themes/twentytwentyfour/patterns/faq.php b/wp-content/themes/twentytwentyfour/patterns/faq.php deleted file mode 100644 index 3bafe36338..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/faq.php +++ /dev/null @@ -1,54 +0,0 @@ - - - - - diff --git a/wp-content/themes/twentytwentyfour/patterns/feature-grid.php b/wp-content/themes/twentytwentyfour/patterns/feature-grid.php deleted file mode 100644 index 9f14b7fc69..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/feature-grid.php +++ /dev/null @@ -1,103 +0,0 @@ - - - -
-
- -

- - - - - - - -

-
- - - - - - - -
-
- -

- - - -

-
- - - -
- -

- - - -

-
- - - -
- -

- - - -

-
-
- - - - - - - -
-
- -

- - - -

-
- - - -
- -

- - - -

-
- - - -
- -

- - - -

-
-
-
- diff --git a/wp-content/themes/twentytwentyfour/patterns/features-with-images.php b/wp-content/themes/twentytwentyfour/patterns/features-with-images.php deleted file mode 100644 index a947821186..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/features-with-images.php +++ /dev/null @@ -1,100 +0,0 @@ - - - -
-
-
- - -

- - - -

-
- - - - - - - -
-
-
- -

-
- - - -
    - - -
  • - - - -
  • - - - -
  • - - -
-
- - - -
-
<?php esc_attr_e( 'Tourist taking photo of a building', 'twentytwentyfour' ); ?>
-
-
- - - - - - - -
-
-
<?php esc_attr_e( 'Windows of a building in Nuremberg, Germany', 'twentytwentyfour' ); ?>
-
- - - -
-
- - -

-
- - - -
    - -
  • - - - -
  • - - - -
  • -
-
-
-
-
- diff --git a/wp-content/themes/twentytwentyfour/patterns/footer-writer.php b/wp-content/themes/twentytwentyfour/patterns/footer-centered-logo-nav.php similarity index 54% rename from wp-content/themes/twentytwentyfour/patterns/footer-writer.php rename to wp-content/themes/twentytwentyfour/patterns/footer-centered-logo-nav.php index 2e81e7804f..4370eac6b2 100644 --- a/wp-content/themes/twentytwentyfour/patterns/footer-writer.php +++ b/wp-content/themes/twentytwentyfour/patterns/footer-centered-logo-nav.php @@ -1,7 +1,7 @@
- + - + - - -
+

+ +
diff --git a/wp-content/themes/twentytwentyfour/patterns/footer-portfolio.php b/wp-content/themes/twentytwentyfour/patterns/footer-colophon-3-col.php similarity index 83% rename from wp-content/themes/twentytwentyfour/patterns/footer-portfolio.php rename to wp-content/themes/twentytwentyfour/patterns/footer-colophon-3-col.php index a92bdce457..cfb15db49b 100644 --- a/wp-content/themes/twentytwentyfour/patterns/footer-portfolio.php +++ b/wp-content/themes/twentytwentyfour/patterns/footer-colophon-3-col.php @@ -1,7 +1,7 @@
-
+
+ +
-
+
@@ -33,7 +35,7 @@
-

+

@@ -51,7 +53,7 @@
-

+

/

@@ -84,14 +86,14 @@

WordPress'; - echo sprintf( - /* Translators: Designed with WordPress */ - esc_html__( 'Designed with %1$s', 'twentytwentyfour' ), - $wordpress_link - ); - ?> + /* Translators: WordPress link. */ + $wordpress_link = 'WordPress'; + echo sprintf( + /* Translators: Designed with WordPress */ + esc_html__( 'Designed with %1$s', 'twentytwentyfour' ), + $wordpress_link + ); + ?>

diff --git a/wp-content/themes/twentytwentyfour/patterns/footer.php b/wp-content/themes/twentytwentyfour/patterns/footer.php index 5ac338d152..b39b3ddf7a 100644 --- a/wp-content/themes/twentytwentyfour/patterns/footer.php +++ b/wp-content/themes/twentytwentyfour/patterns/footer.php @@ -1,6 +1,6 @@ -
-
-
-
+
+ +
+ +
+ +
+ - + -
-
- + +
+ +
+ - -
- + +
+
+ - -
-
-
-

- + +
+ +
+ +
+ +

+ - -
+ +
- + - - - + + + - + +
+ +
+ + + + +
+ +

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

+ + + +
+ + + + + + + + + +
+ +
+ +
+ +
+ +
+ + + +
+ + + +
+
-
- - - - -
-

- - - -
- - - - - - - - - -
-
- - - -
-

- - - -
- - - - - - - - - -
-
-
-
-
- - - -
- -
-
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-full-screen-image.php b/wp-content/themes/twentytwentyfour/patterns/gallery-full-screen-image.php similarity index 51% rename from wp-content/themes/twentytwentyfour/patterns/hidden-full-screen-image.php rename to wp-content/themes/twentytwentyfour/patterns/gallery-full-screen-image.php index fb378fb43e..ee26fca4f6 100644 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-full-screen-image.php +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-full-screen-image.php @@ -1,14 +1,21 @@ -
- - -
+
+ + +
+ + + +
+
diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php new file mode 100644 index 0000000000..67ea044cb1 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-2-col.php @@ -0,0 +1,58 @@ + + +
+ +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ +
+ + + +
+ + + + + +
+
+ + + + + + + +
+
+ +
+ +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php new file mode 100644 index 0000000000..3280317e10 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-3-col.php @@ -0,0 +1,110 @@ + + +
+ +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ + + +
+ + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php new file mode 100644 index 0000000000..8c89db80d5 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-offset-images-grid-4-col.php @@ -0,0 +1,149 @@ + + + +
+ +
+ +
+ +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ + + +
+ + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ + + +
+ + + + + +
+ +
+ + + + + + + +
+ +
+ + + + + + + +
+ +
+ +
+ +
+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php b/wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php new file mode 100644 index 0000000000..27d6f74646 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/gallery-project-layout.php @@ -0,0 +1,65 @@ + + + + + diff --git a/wp-content/themes/twentytwentyfour/patterns/hero.php b/wp-content/themes/twentytwentyfour/patterns/hero.php deleted file mode 100644 index edd80d841b..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/hero.php +++ /dev/null @@ -1,42 +0,0 @@ - - - -
-
-

- - - - - - - -

- - - - - - - -
-
-
-
- - - - - - - -
<?php esc_attr_e( 'Building exterior in Toronto, Canada', 'twentytwentyfour' ); ?>
-
- diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-404.php b/wp-content/themes/twentytwentyfour/patterns/hidden-404.php index 196c415185..d033a13f44 100644 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-404.php +++ b/wp-content/themes/twentytwentyfour/patterns/hidden-404.php @@ -1,7 +1,7 @@ @@ -10,6 +10,6 @@

-

+

- + diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-comments.php b/wp-content/themes/twentytwentyfour/patterns/hidden-comments.php index b54fd8f363..bd10668462 100644 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-comments.php +++ b/wp-content/themes/twentytwentyfour/patterns/hidden-comments.php @@ -1,45 +1,47 @@
-

+ +

+ - -
- + +
+ +
+ +
- - -
- - -
- -
- - - -
- - + +
+ + +
+ + +
+ +
+ - - + + - +
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php b/wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php deleted file mode 100644 index e3791cface..0000000000 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-hidden-intro-text-left.php +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - -
- -
-
- -

Leia Acosta, a passionate photographer who finds inspiration in capturing the fleeting beauty of life.' ) ); ?>

- -
- - - -
-
-
- diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-no-results-content.php b/wp-content/themes/twentytwentyfour/patterns/hidden-no-results.php similarity index 73% rename from wp-content/themes/twentytwentyfour/patterns/hidden-no-results-content.php rename to wp-content/themes/twentytwentyfour/patterns/hidden-no-results.php index 048ac787cf..00bbf9761b 100644 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-no-results-content.php +++ b/wp-content/themes/twentytwentyfour/patterns/hidden-no-results.php @@ -1,7 +1,7 @@ diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php b/wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php new file mode 100644 index 0000000000..29e6abc9f3 --- /dev/null +++ b/wp-content/themes/twentytwentyfour/patterns/hidden-portfolio-hero.php @@ -0,0 +1,19 @@ + + + + + + + +
+ +

Leia Acosta, a passionate photographer who finds inspiration in capturing the fleeting beauty of life.' ) ); ?>

+ +
+ diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-post-meta.php b/wp-content/themes/twentytwentyfour/patterns/hidden-post-meta.php index b21a4dfe98..add4a1c8f3 100644 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-post-meta.php +++ b/wp-content/themes/twentytwentyfour/patterns/hidden-post-meta.php @@ -1,27 +1,30 @@ -
-
+
+ +
+ - -

- + +

+ - -

- + +

+ - + - + +
+
-
diff --git a/wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php b/wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php index e9a502369f..be2dcb28b7 100644 --- a/wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php +++ b/wp-content/themes/twentytwentyfour/patterns/hidden-post-navigation.php @@ -1,14 +1,14 @@ - -