From e02a2e78e56c9d4e9a14ee6a5871b13eaac9ec07 Mon Sep 17 00:00:00 2001 From: Jessica Lyschik Date: Fri, 27 Oct 2023 21:22:37 +0200 Subject: [PATCH 1/7] Rename home to front-page, change pattern, update template slugs --- patterns/page-home-business.php | 12 ++++++++++-- patterns/template-home-business.php | 4 ++-- templates/front-page.html | 1 + templates/home.html | 1 - 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 templates/front-page.html delete mode 100644 templates/home.html diff --git a/patterns/page-home-business.php b/patterns/page-home-business.php index fb526b25..218d2122 100644 --- a/patterns/page-home-business.php +++ b/patterns/page-home-business.php @@ -1,7 +1,7 @@ - + +
+ +

+ + + +
+ diff --git a/patterns/template-home-business.php b/patterns/template-home-business.php index e6a41b74..f546456d 100644 --- a/patterns/template-home-business.php +++ b/patterns/template-home-business.php @@ -1,7 +1,7 @@
- +
diff --git a/templates/front-page.html b/templates/front-page.html new file mode 100644 index 00000000..7c364b85 --- /dev/null +++ b/templates/front-page.html @@ -0,0 +1 @@ + diff --git a/templates/home.html b/templates/home.html deleted file mode 100644 index 92c4c041..00000000 --- a/templates/home.html +++ /dev/null @@ -1 +0,0 @@ - From eddcca715471c3756908cdd04f7595b728d49efc Mon Sep 17 00:00:00 2001 From: Jessica Lyschik Date: Fri, 27 Oct 2023 21:47:41 +0200 Subject: [PATCH 2/7] Fix PHPCS errors --- patterns/page-home-business.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patterns/page-home-business.php b/patterns/page-home-business.php index 218d2122..f8c16afd 100644 --- a/patterns/page-home-business.php +++ b/patterns/page-home-business.php @@ -19,8 +19,8 @@

- - + + From 209f79230021e7fc2fb9f2da28a03533772e0608 Mon Sep 17 00:00:00 2001 From: MaggieCabrera Date: Mon, 30 Oct 2023 12:46:45 +0100 Subject: [PATCH 3/7] add new block pattern for a list of posts --- patterns/page-home-business.php | 10 +----- patterns/posts-list.php | 62 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 patterns/posts-list.php diff --git a/patterns/page-home-business.php b/patterns/page-home-business.php index f8c16afd..ca229521 100644 --- a/patterns/page-home-business.php +++ b/patterns/page-home-business.php @@ -14,13 +14,5 @@ - -
- -

- - - -
- + diff --git a/patterns/posts-list.php b/patterns/posts-list.php new file mode 100644 index 00000000..5877fca0 --- /dev/null +++ b/patterns/posts-list.php @@ -0,0 +1,62 @@ + + + +
+ +

+ + + +
+ +
+ + +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + +
+ +
+ +
+ \ No newline at end of file From 687767172a86a2ce6cbaad5ab58e6782e95d18bd Mon Sep 17 00:00:00 2001 From: MaggieCabrera Date: Mon, 30 Oct 2023 12:51:48 +0100 Subject: [PATCH 4/7] removed pattern --- patterns/page-home-business.php | 58 +++++++++++++++++++++++++++++- patterns/posts-list.php | 62 --------------------------------- 2 files changed, 57 insertions(+), 63 deletions(-) delete mode 100644 patterns/posts-list.php diff --git a/patterns/page-home-business.php b/patterns/page-home-business.php index ca229521..2c8e1fb9 100644 --- a/patterns/page-home-business.php +++ b/patterns/page-home-business.php @@ -14,5 +14,61 @@ - + + + +
+ +

+ + + +
+ +
+ + +
+ + + +
+ +
+ +
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + +
+ +
+ +
+ + + diff --git a/patterns/posts-list.php b/patterns/posts-list.php deleted file mode 100644 index 5877fca0..00000000 --- a/patterns/posts-list.php +++ /dev/null @@ -1,62 +0,0 @@ - - - -
- -

- - - -
- -
- - -
- - - -
- -
- -
- - - -
- -
- -
- - - - - - - - - - - - - - - - - - -
- -
- -
- \ No newline at end of file From dafa50fcc0383362a59d8c9e3b07d31dedea9cca Mon Sep 17 00:00:00 2001 From: Jessica Lyschik Date: Mon, 30 Oct 2023 16:08:00 +0100 Subject: [PATCH 5/7] Revert renaming change --- templates/{front-page.html => home.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename templates/{front-page.html => home.html} (100%) diff --git a/templates/front-page.html b/templates/home.html similarity index 100% rename from templates/front-page.html rename to templates/home.html From c7469d5ea261295fe0a1d400242958be25555558 Mon Sep 17 00:00:00 2001 From: Jessica Lyschik Date: Mon, 30 Oct 2023 16:29:13 +0100 Subject: [PATCH 6/7] Fix merge conflict from trunk --- CONTRIBUTORS.md | 3 ++- patterns/page-home-blogging.php | 2 +- patterns/template-home-business.php | 2 +- patterns/template-home-portfolio.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8642770e..12016f93 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -51,7 +51,7 @@ | @scruffian | @scruffian | | @alexandrebuffet | @alexandrebuffet | | @gpotter | @gpotter | -| @michaelshowes | | +| @michaelshowes | @mshowes | | @lefty55104 | @pbwebd | | @anphira | @anphira | | @rebekahmarkowitz | @rebekowitz | @@ -124,3 +124,4 @@ | @SavPhill | @phillsav | | @cybeardjm | @didierjm | | @fabiorubioglio | @fabiorubioglio | +| @KevinTaron | @ktaron | diff --git a/patterns/page-home-blogging.php b/patterns/page-home-blogging.php index d1c52425..ae88e900 100644 --- a/patterns/page-home-blogging.php +++ b/patterns/page-home-blogging.php @@ -22,7 +22,7 @@
- +
diff --git a/patterns/template-home-business.php b/patterns/template-home-business.php index f546456d..e84a5aca 100644 --- a/patterns/template-home-business.php +++ b/patterns/template-home-business.php @@ -2,7 +2,7 @@ /** * Title: Business home template * Slug: twentytwentyfour/template-home-business - * Template Types: front-page, index, home + * Template Types: front-page, home * Viewport width: 1400 * Inserter: no */ diff --git a/patterns/template-home-portfolio.php b/patterns/template-home-portfolio.php index 23e45032..4fc4f072 100644 --- a/patterns/template-home-portfolio.php +++ b/patterns/template-home-portfolio.php @@ -2,7 +2,7 @@ /** * Title: Portfolio home template with post featured images * Slug: twentytwentyfour/template-home-portfolio - * Template Types: front-page, index, home + * Template Types: front-page, home * Viewport width: 1400 * Inserter: no */ From dd8fc542face0fda56801a6df01a139e93123603 Mon Sep 17 00:00:00 2001 From: MaggieCabrera Date: Mon, 30 Oct 2023 18:53:10 +0100 Subject: [PATCH 7/7] created block pattern --- patterns/page-home-business.php | 58 +----------------------------- patterns/posts-list.php | 62 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 57 deletions(-) create mode 100644 patterns/posts-list.php diff --git a/patterns/page-home-business.php b/patterns/page-home-business.php index 2c8e1fb9..ca229521 100644 --- a/patterns/page-home-business.php +++ b/patterns/page-home-business.php @@ -14,61 +14,5 @@ - - - -
- -

- - - -
- -
- - -
- - - -
- -
- -
- - - -
- -
- -
- - - - - - - - - - - - - - - - - - -
- -
- -
- - - + diff --git a/patterns/posts-list.php b/patterns/posts-list.php new file mode 100644 index 00000000..a9e5aeeb --- /dev/null +++ b/patterns/posts-list.php @@ -0,0 +1,62 @@ + + + +
+ +

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