From ad1be0f544f90077d794bb4b867b816380450958 Mon Sep 17 00:00:00 2001 From: Alex Lion Date: Sun, 30 Jul 2023 01:16:35 -0700 Subject: [PATCH 01/55] Make UI strings can be localized in patterns (Based 1.0.5) In 1.0.5, there are a lot of pattern files changed so I close [PR#147](https://github.com/wpengine/frost/pull/147) and submit this new PR to improve I18N issues. --- patterns/footer-default-dark.php | 4 ++-- patterns/footer-mega-dark.php | 10 +++++----- patterns/footer-mega.php | 10 +++++----- patterns/footer-stacked-dark.php | 2 +- patterns/footer-stacked.php | 2 +- patterns/footer-three-columns-dark.php | 2 +- patterns/footer-three-columns.php | 2 +- patterns/hero-one-column.php | 2 +- patterns/hero-two-columns.php | 2 +- patterns/page-about.php | 22 +++++++++++----------- patterns/page-home.php | 8 ++++---- patterns/page-link.php | 2 +- patterns/page-pricing.php | 8 ++++---- patterns/portfolio.php | 8 ++++---- patterns/pricing-four-columns-dark.php | 8 ++++---- patterns/pricing-four-columns.php | 8 ++++---- patterns/pricing-three-columns-dark.php | 6 +++--- patterns/pricing-three-columns.php | 6 +++--- patterns/pricing-two-columns-dark.php | 4 ++-- patterns/pricing-two-columns.php | 4 ++-- patterns/product-box-dark.php | 2 +- patterns/product-box.php | 2 +- patterns/team-four-columns.php | 8 ++++---- patterns/testimonials-dark.php | 6 +++--- patterns/testimonials-image-dark.php | 18 +++++++++--------- patterns/testimonials-image.php | 18 +++++++++--------- patterns/testimonials.php | 6 +++--- 27 files changed, 90 insertions(+), 90 deletions(-) diff --git a/patterns/footer-default-dark.php b/patterns/footer-default-dark.php index 512fb848..0c09c639 100644 --- a/patterns/footer-default-dark.php +++ b/patterns/footer-default-dark.php @@ -9,10 +9,10 @@ diff --git a/patterns/footer-mega-dark.php b/patterns/footer-mega-dark.php index 9c0c8006..d6c7cfb5 100644 --- a/patterns/footer-mega-dark.php +++ b/patterns/footer-mega-dark.php @@ -71,19 +71,19 @@ diff --git a/patterns/footer-mega.php b/patterns/footer-mega.php index 540147ee..6d588c7e 100644 --- a/patterns/footer-mega.php +++ b/patterns/footer-mega.php @@ -71,19 +71,19 @@ diff --git a/patterns/footer-stacked-dark.php b/patterns/footer-stacked-dark.php index 9b6531a9..0fa9ee2b 100644 --- a/patterns/footer-stacked-dark.php +++ b/patterns/footer-stacked-dark.php @@ -19,6 +19,6 @@ -

© Your Company LLC ·

+

© ·

diff --git a/patterns/footer-stacked.php b/patterns/footer-stacked.php index f7c47ae9..32a8a3b2 100644 --- a/patterns/footer-stacked.php +++ b/patterns/footer-stacked.php @@ -19,6 +19,6 @@ -

© 2023 Your Company LLC ·

+

© 2023 ·

diff --git a/patterns/footer-three-columns-dark.php b/patterns/footer-three-columns-dark.php index c74f74cf..3e533574 100644 --- a/patterns/footer-three-columns-dark.php +++ b/patterns/footer-three-columns-dark.php @@ -12,7 +12,7 @@
-

© Your Company LLC

+

©

· ·

diff --git a/patterns/footer-three-columns.php b/patterns/footer-three-columns.php index c31de8ea..c2de1129 100644 --- a/patterns/footer-three-columns.php +++ b/patterns/footer-three-columns.php @@ -9,7 +9,7 @@
-

© Your Company LLC

+

©

· ·

diff --git a/patterns/hero-one-column.php b/patterns/hero-one-column.php index fd015874..a93f8dbd 100644 --- a/patterns/hero-one-column.php +++ b/patterns/hero-one-column.php @@ -7,7 +7,7 @@ ?>
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

diff --git a/patterns/hero-two-columns.php b/patterns/hero-two-columns.php index 1287003a..9fa11351 100644 --- a/patterns/hero-two-columns.php +++ b/patterns/hero-two-columns.php @@ -27,7 +27,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>
diff --git a/patterns/page-about.php b/patterns/page-about.php index 0863dca0..4e16f996 100644 --- a/patterns/page-about.php +++ b/patterns/page-about.php @@ -25,7 +25,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>
@@ -33,26 +33,26 @@
-
Sample Logo
+
<?php echo esc_attr__( 'Sample Logo', 'frost' ); ?>
-
Sample Logo
+
<?php echo esc_attr__( 'Sample Logo', 'frost' ); ?>
-
Sample Logo
+
<?php echo esc_attr__( 'Sample Logo', 'frost' ); ?>
-
Sample Logo
+
<?php echo esc_attr__( 'Sample Logo', 'frost' ); ?>
-
Sample Logo
+
<?php echo esc_attr__( 'Sample Logo', 'frost' ); ?>
-

Build with Frost.

+

@@ -149,7 +149,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

@@ -165,7 +165,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

@@ -181,7 +181,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

@@ -197,7 +197,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

diff --git a/patterns/page-home.php b/patterns/page-home.php index 54f91fb7..b5a7293a 100644 --- a/patterns/page-home.php +++ b/patterns/page-home.php @@ -41,7 +41,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>
@@ -58,7 +58,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>
@@ -91,14 +91,14 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>
diff --git a/patterns/page-link.php b/patterns/page-link.php index 8a0d6a84..c70afc0c 100644 --- a/patterns/page-link.php +++ b/patterns/page-link.php @@ -8,7 +8,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

diff --git a/patterns/page-pricing.php b/patterns/page-pricing.php index 71c40172..6895971f 100644 --- a/patterns/page-pricing.php +++ b/patterns/page-pricing.php @@ -22,7 +22,7 @@

-

$95/yr.

+

@@ -69,7 +69,7 @@

-

$195/yr.

+

@@ -116,7 +116,7 @@

-

$495/yr.

+

@@ -163,7 +163,7 @@
-

FAQs

+

diff --git a/patterns/portfolio.php b/patterns/portfolio.php index 13bccc17..9a63888c 100644 --- a/patterns/portfolio.php +++ b/patterns/portfolio.php @@ -23,16 +23,16 @@
diff --git a/patterns/pricing-four-columns-dark.php b/patterns/pricing-four-columns-dark.php index 954d798b..7259a0c9 100644 --- a/patterns/pricing-four-columns-dark.php +++ b/patterns/pricing-four-columns-dark.php @@ -13,7 +13,7 @@

-

$95/yr.

+

@@ -60,7 +60,7 @@

-

$195/yr.

+

@@ -107,7 +107,7 @@

-

$495/yr.

+

@@ -154,7 +154,7 @@

-

$995/yr.

+

diff --git a/patterns/pricing-four-columns.php b/patterns/pricing-four-columns.php index db1e4d4c..3f272eef 100644 --- a/patterns/pricing-four-columns.php +++ b/patterns/pricing-four-columns.php @@ -13,7 +13,7 @@

-

$95/yr.

+

@@ -60,7 +60,7 @@

-

$195/yr.

+

@@ -107,7 +107,7 @@

-

$495/yr.

+

@@ -154,7 +154,7 @@

-

$995/yr.

+

diff --git a/patterns/pricing-three-columns-dark.php b/patterns/pricing-three-columns-dark.php index 3b72a0dc..00a45956 100644 --- a/patterns/pricing-three-columns-dark.php +++ b/patterns/pricing-three-columns-dark.php @@ -13,7 +13,7 @@

-

$95/yr.

+

@@ -60,7 +60,7 @@

-

$195/yr.

+

@@ -107,7 +107,7 @@

-

$495/yr.

+

diff --git a/patterns/pricing-three-columns.php b/patterns/pricing-three-columns.php index 1a611e5d..62e9a06f 100644 --- a/patterns/pricing-three-columns.php +++ b/patterns/pricing-three-columns.php @@ -13,7 +13,7 @@

-

$95/yr.

+

@@ -60,7 +60,7 @@

-

$195/yr.

+

@@ -107,7 +107,7 @@

-

$495/yr.

+

diff --git a/patterns/pricing-two-columns-dark.php b/patterns/pricing-two-columns-dark.php index 7a9d38cb..acc4bf3b 100644 --- a/patterns/pricing-two-columns-dark.php +++ b/patterns/pricing-two-columns-dark.php @@ -13,7 +13,7 @@

-

$95/yr.

+

@@ -60,7 +60,7 @@

-

$195/yr.

+

diff --git a/patterns/pricing-two-columns.php b/patterns/pricing-two-columns.php index 2325818c..8b8776b4 100644 --- a/patterns/pricing-two-columns.php +++ b/patterns/pricing-two-columns.php @@ -13,7 +13,7 @@

-

$95/yr.

+

@@ -60,7 +60,7 @@

-

$195/yr.

+

diff --git a/patterns/product-box-dark.php b/patterns/product-box-dark.php index 3b3a7660..1c7e36b3 100644 --- a/patterns/product-box-dark.php +++ b/patterns/product-box-dark.php @@ -9,7 +9,7 @@
-
Frost Theme Sample Image
+
<?php echo esc_attr__( 'Frost Theme Sample Image', 'frost' ); ?>
diff --git a/patterns/product-box.php b/patterns/product-box.php index 75844517..3ea1d33b 100644 --- a/patterns/product-box.php +++ b/patterns/product-box.php @@ -9,7 +9,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>
diff --git a/patterns/team-four-columns.php b/patterns/team-four-columns.php index cc4a2b03..1429a726 100644 --- a/patterns/team-four-columns.php +++ b/patterns/team-four-columns.php @@ -9,7 +9,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

@@ -25,7 +25,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

@@ -41,7 +41,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

@@ -57,7 +57,7 @@
-
Sample Image
+
<?php echo esc_attr__( 'Sample Image', 'frost' ); ?>

diff --git a/patterns/testimonials-dark.php b/patterns/testimonials-dark.php index ba2535fd..65c7de4c 100644 --- a/patterns/testimonials-dark.php +++ b/patterns/testimonials-dark.php @@ -15,7 +15,7 @@

-

—Allison Taylor, Designer

+

@@ -26,7 +26,7 @@

-

—Anthony Breck, Developer

+

@@ -37,7 +37,7 @@

-

—Rebecca Jones, Coach

+

diff --git a/patterns/testimonials-image-dark.php b/patterns/testimonials-image-dark.php index 547e7248..2a98aed6 100644 --- a/patterns/testimonials-image-dark.php +++ b/patterns/testimonials-image-dark.php @@ -16,14 +16,14 @@
-
Testimonial Avatar
+
<?php echo esc_attr__( 'Testimonial Avatar', 'frost' ); ?>
-

Allison Taylor

+

-

Designer

+

@@ -37,14 +37,14 @@
-
Testimonial Avatar
+
<?php echo esc_attr__( 'Testimonial Avatar', 'frost' ); ?>
-

Anthony Breck

+

-

Developer

+

@@ -58,14 +58,14 @@
-
Testimonial Avatar
+
<?php echo esc_attr__( 'Testimonial Avatar', 'frost' ); ?>
-

Rebecca Jones

+

-

Coach

+

diff --git a/patterns/testimonials-image.php b/patterns/testimonials-image.php index 5238ce4d..248b30af 100644 --- a/patterns/testimonials-image.php +++ b/patterns/testimonials-image.php @@ -16,14 +16,14 @@
-
Testimonial Avatar
+
<?php echo esc_attr__( 'Testimonial Avatar', 'frost' ); ?>
-

Allison Taylor

+

-

Designer

+

@@ -37,14 +37,14 @@
-
Testimonial Avatar
+
<?php echo esc_attr__( 'Testimonial Avatar', 'frost' ); ?>
-

Anthony Breck

+

-

Developer

+

@@ -58,14 +58,14 @@
-
Testimonial Avatar
+
<?php echo esc_attr__( 'Testimonial Avatar', 'frost' ); ?>
-

Rebecca Jones

+

-

Coach

+

diff --git a/patterns/testimonials.php b/patterns/testimonials.php index 3041ecfb..d068558c 100644 --- a/patterns/testimonials.php +++ b/patterns/testimonials.php @@ -15,7 +15,7 @@

-

—Allison Taylor, Designer

+

@@ -26,7 +26,7 @@

-

—Anthony Breck, Developer

+

@@ -37,7 +37,7 @@

-

—Rebecca Jones, Coach

+

From f2c2fb52edf73ad4215edeb09d4ec1a83b615305 Mon Sep 17 00:00:00 2001 From: Brian Gardner Date: Wed, 2 Aug 2023 10:50:28 -0500 Subject: [PATCH 02/55] Use blockGap for Post Template spacing. --- theme.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/theme.json b/theme.json index a1afc110..9093323d 100644 --- a/theme.json +++ b/theme.json @@ -414,7 +414,9 @@ "css": "& input[type=submit] {width: auto;} & label {font-size: var(--wp--preset--font-size--x-small);}" }, "core/post-template": { - "css": "& .wp-block-post:not(:last-of-type) {margin-bottom: var(--wp--preset--spacing--medium);}" + "spacing": { + "blockGap": "var(--wp--preset--spacing--medium);" + } }, "core/preformatted": { "color": { From 37e59f4be67dd278c98db9dba5a8fa69ea1d6254 Mon Sep 17 00:00:00 2001 From: Brian Gardner Date: Sun, 13 Aug 2023 12:31:52 -0500 Subject: [PATCH 03/55] Add descriptions to style variations. --- styles/graphite.json | 1 + styles/green.json | 1 + styles/magenta.json | 1 + styles/orange.json | 1 + styles/purple.json | 1 + styles/red.json | 1 + styles/teal.json | 1 + 7 files changed, 7 insertions(+) diff --git a/styles/graphite.json b/styles/graphite.json index 97ef9a51..7150d925 100644 --- a/styles/graphite.json +++ b/styles/graphite.json @@ -2,6 +2,7 @@ "version": 2, "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Graphite", + "description": "Graphite-based palette with two shades", "settings": { "color": { "duotone": [ diff --git a/styles/green.json b/styles/green.json index b4870e32..8ec08574 100644 --- a/styles/green.json +++ b/styles/green.json @@ -2,6 +2,7 @@ "version": 2, "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Green", + "description": "Green-based palette with two shades", "settings": { "color": { "duotone": [ diff --git a/styles/magenta.json b/styles/magenta.json index 0cdd47ff..9d48cc6e 100644 --- a/styles/magenta.json +++ b/styles/magenta.json @@ -2,6 +2,7 @@ "version": 2, "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Magenta", + "description": "Magenta-based palette with two shades", "settings": { "color": { "duotone": [ diff --git a/styles/orange.json b/styles/orange.json index 732a7240..47222ae8 100644 --- a/styles/orange.json +++ b/styles/orange.json @@ -2,6 +2,7 @@ "version": 2, "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Orange", + "description": "Orange-based palette with two shades", "settings": { "color": { "duotone": [ diff --git a/styles/purple.json b/styles/purple.json index 28341e63..9d727bb6 100644 --- a/styles/purple.json +++ b/styles/purple.json @@ -2,6 +2,7 @@ "version": 2, "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Purple", + "description": "Purple-based palette with two shades", "settings": { "color": { "duotone": [ diff --git a/styles/red.json b/styles/red.json index b084220b..f5151165 100644 --- a/styles/red.json +++ b/styles/red.json @@ -2,6 +2,7 @@ "version": 2, "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Red", + "description": "Red-based palette with two shades", "settings": { "color": { "duotone": [ diff --git a/styles/teal.json b/styles/teal.json index 7d9935e2..b4b862b6 100644 --- a/styles/teal.json +++ b/styles/teal.json @@ -2,6 +2,7 @@ "version": 2, "$schema": "https://schemas.wp.org/trunk/theme.json", "title": "Teal", + "description": "Teal-based palette with two shades", "settings": { "color": { "duotone": [ From 62deb1a734b72321c355e62def8f1ec09084421e Mon Sep 17 00:00:00 2001 From: Brian Gardner Date: Mon, 14 Aug 2023 08:18:25 -0500 Subject: [PATCH 04/55] Remove viewport width from pattern. --- patterns/footer-three-columns-dark.php | 1 - 1 file changed, 1 deletion(-) diff --git a/patterns/footer-three-columns-dark.php b/patterns/footer-three-columns-dark.php index 3e533574..d9e3677b 100644 --- a/patterns/footer-three-columns-dark.php +++ b/patterns/footer-three-columns-dark.php @@ -4,7 +4,6 @@ * Slug: frost/footer-three-columns-dark * Categories: footer * Block Types: core/template-part/footer - * Viewport Width: 1280 */ ?> From 16a0b5413b880b0fcb0ff2813f6742c7cf5491d4 Mon Sep 17 00:00:00 2001 From: Brian Gardner Date: Wed, 16 Aug 2023 08:08:09 -0500 Subject: [PATCH 05/55] Rename Query pattern, add Posts Grid pattern. Closes #144 --- patterns/posts-grid.php | 34 +++++++++++++++++++++++++++++++ patterns/{query.php => posts.php} | 5 +++-- templates/archive.html | 2 +- templates/index.html | 2 +- templates/search.html | 2 +- 5 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 patterns/posts-grid.php rename patterns/{query.php => posts.php} (94%) diff --git a/patterns/posts-grid.php b/patterns/posts-grid.php new file mode 100644 index 00000000..6d765878 --- /dev/null +++ b/patterns/posts-grid.php @@ -0,0 +1,34 @@ + + +
+ + + +
+ + +
+ + +

·

+ + +
+ + +
+ + + + + + +
+ diff --git a/patterns/query.php b/patterns/posts.php similarity index 94% rename from patterns/query.php rename to patterns/posts.php index 19fe3232..3efe2e5d 100644 --- a/patterns/query.php +++ b/patterns/posts.php @@ -1,8 +1,9 @@ diff --git a/templates/archive.html b/templates/archive.html index 2afbaa17..307096df 100644 --- a/templates/archive.html +++ b/templates/archive.html @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/templates/index.html b/templates/index.html index b4bee2cb..ece55e93 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,7 +1,7 @@
- +
\ No newline at end of file diff --git a/templates/search.html b/templates/search.html index 88683eb3..effb3164 100644 --- a/templates/search.html +++ b/templates/search.html @@ -6,7 +6,7 @@ - + \ No newline at end of file From eea027c7854f8680612109dcfa4d36b86b3a53a6 Mon Sep 17 00:00:00 2001 From: Brian Gardner Date: Wed, 16 Aug 2023 10:10:13 -0500 Subject: [PATCH 06/55] Consolidate pattern categories. --- patterns/portfolio.php | 2 +- patterns/team-four-columns.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patterns/portfolio.php b/patterns/portfolio.php index 9a63888c..eedde6d7 100644 --- a/patterns/portfolio.php +++ b/patterns/portfolio.php @@ -2,7 +2,7 @@ /** * Title: Portfolio with heading, text, images. * Slug: frost/portfolio - * Categories: portfolio + * Categories: featured */ ?> diff --git a/patterns/team-four-columns.php b/patterns/team-four-columns.php index 1429a726..26220243 100644 --- a/patterns/team-four-columns.php +++ b/patterns/team-four-columns.php @@ -2,7 +2,7 @@ /** * Title: Team with image, text, link. * Slug: frost/team-four-columns - * Categories: team + * Categories: featured */ ?> From 9bc4212f59bbad02387ca7859254dd645ffddfee Mon Sep 17 00:00:00 2001 From: Brian Gardner Date: Mon, 21 Aug 2023 09:11:41 -0500 Subject: [PATCH 07/55] Fix Footer pattern class. --- patterns/footer-default-dark.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patterns/footer-default-dark.php b/patterns/footer-default-dark.php index 0c09c639..1ef1d925 100644 --- a/patterns/footer-default-dark.php +++ b/patterns/footer-default-dark.php @@ -6,7 +6,7 @@ * Block Types: core/template-part/footer */ ?> - +