From 232b93361d0b8da43c1137cf36d6ef6d3210bffb Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Thu, 30 Nov 2023 14:32:49 +0900 Subject: [PATCH 01/12] Updates to the theme. --- .../themes/wporg-events-2023/functions.php | 2 +- .../wporg-events-2023/parts/footer.html | 20 ----- .../parts/front-page/contributors.html | 83 +++++++++---------- .../wporg-events-2023/patterns/cover.php | 55 ++++++++++++ .../wporg-events-2023/patterns/events.php | 26 ++++++ .../patterns/home-page-callout.php | 30 +++++++ .../patterns/local-navigation.php | 6 +- .../postcss/page/front-page/contributors.pcss | 21 ++--- .../wporg-events-2023/postcss/style.pcss | 1 - .../templates/front-page.html | 8 +- .../templates/page-city-landing-page.html | 2 +- .../wporg-events-2023/templates/page.html | 2 +- 12 files changed, 174 insertions(+), 82 deletions(-) delete mode 100644 public_html/wp-content/themes/wporg-events-2023/parts/footer.html create mode 100644 public_html/wp-content/themes/wporg-events-2023/patterns/cover.php create mode 100644 public_html/wp-content/themes/wporg-events-2023/patterns/events.php create mode 100644 public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php diff --git a/public_html/wp-content/themes/wporg-events-2023/functions.php b/public_html/wp-content/themes/wporg-events-2023/functions.php index 4606d8508b..eb9bbd4356 100644 --- a/public_html/wp-content/themes/wporg-events-2023/functions.php +++ b/public_html/wp-content/themes/wporg-events-2023/functions.php @@ -24,7 +24,7 @@ function enqueue_assets() { wp_enqueue_style( 'wporg-events-2023-style', get_stylesheet_uri(), - array( 'wporg-parent-2021-style', 'wporg-global-fonts' ), + array( 'wporg-parent-2021-style', 'wporg-parent-block-styles', 'wporg-global-fonts' ), filemtime( __DIR__ . '/style.css' ) ); } diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/footer.html b/public_html/wp-content/themes/wporg-events-2023/parts/footer.html deleted file mode 100644 index 2161a7b750..0000000000 --- a/public_html/wp-content/themes/wporg-events-2023/parts/footer.html +++ /dev/null @@ -1,20 +0,0 @@ - -
- -

If you can't find a WordPress event around your area, you can become an organizer - and start hosting WordPress events.

- - - -
-
Become an - organizer
- -
- -
- - - diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html index 4358bc0eea..b2409686c5 100644 --- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html +++ b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html @@ -1,43 +1,42 @@ - -
- -
- -

Where all WordPress contributors meet

- - - - - -
+ +
+
+
+

Where all WordPress contributors meet

+ + + + +
+ + + +
+
+
+
+
- - -
- \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php new file mode 100644 index 0000000000..9a3ee8590b --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php @@ -0,0 +1,55 @@ + + + + +
+
+
+

Meet the community behind WordPress

+ + + +

All over the world contributors meet to share, learn, and collaborate for the WordPress project.

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

44,744 events this year

+
+
+ + + +
+
+

108 countries

+
+
+ + + +
+
+

540,537 members

+
+
+
+
+
+ \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/events.php b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php new file mode 100644 index 0000000000..ffeeaa50ec --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php @@ -0,0 +1,26 @@ + + + + +
+
+

Upcoming Events

+ + + + + +
+
See all + events
+
+
+
+ \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php b/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php new file mode 100644 index 0000000000..21d9a33417 --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php @@ -0,0 +1,30 @@ + + + + +
+
+
+
+

If you can't find a WordPress event around your area, you can become an organizer + and start hosting WordPress events.

+
+ + + +
+
+
Learn more
+
+
+
+
+
+ \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php b/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php index b5e8d4d13c..318a292c22 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php @@ -14,8 +14,8 @@ ?> - + - - + + \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss index 10e0633bd2..22d666c3a5 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss @@ -1,16 +1,17 @@ .wporg-events__contributors { - - @media (--phone-tablet) { - &.is-layout-flex { - display: block; - } - } - - & .is-style-links-list > li:first-child { + .is-style-links-list li:first-child { border-top: none; } - & .is-style-links-list > li:last-child { + .is-style-links-list li:last-child { border-bottom: none; } -} \ No newline at end of file + + .is-style-links-list li { + border-color: var(--wp--preset--color--light-grey-1); + + a { + color: var(--wp--preset--color--charcoal-0); + } + } +} diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss index 06cb636dd5..685c7b602e 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss @@ -9,7 +9,6 @@ /* Base */ @import "base/breakpoints.pcss"; @import "base/layout.pcss"; -@import "base/footer.pcss"; /* Pages */ @import "page/front-page/cover.pcss"; diff --git a/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html b/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html index d23498ca59..1ce2cc7c5c 100644 --- a/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html +++ b/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html @@ -2,12 +2,14 @@
- + - +
- + + + diff --git a/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html b/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html index bd1754d5a5..05a17311db 100644 --- a/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html +++ b/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html @@ -6,4 +6,4 @@ - + diff --git a/public_html/wp-content/themes/wporg-events-2023/templates/page.html b/public_html/wp-content/themes/wporg-events-2023/templates/page.html index eeef6d2e27..89506911f5 100644 --- a/public_html/wp-content/themes/wporg-events-2023/templates/page.html +++ b/public_html/wp-content/themes/wporg-events-2023/templates/page.html @@ -8,4 +8,4 @@ - + From 2add16cf4df91a80381725f76363a19ec31109d9 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Thu, 30 Nov 2023 14:34:07 +0900 Subject: [PATCH 02/12] Remove the parent block style --- public_html/wp-content/themes/wporg-events-2023/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/wp-content/themes/wporg-events-2023/functions.php b/public_html/wp-content/themes/wporg-events-2023/functions.php index eb9bbd4356..4606d8508b 100644 --- a/public_html/wp-content/themes/wporg-events-2023/functions.php +++ b/public_html/wp-content/themes/wporg-events-2023/functions.php @@ -24,7 +24,7 @@ function enqueue_assets() { wp_enqueue_style( 'wporg-events-2023-style', get_stylesheet_uri(), - array( 'wporg-parent-2021-style', 'wporg-parent-block-styles', 'wporg-global-fonts' ), + array( 'wporg-parent-2021-style', 'wporg-global-fonts' ), filemtime( __DIR__ . '/style.css' ) ); } From 223d07aba82eccf48f536726fbb5008d46b14cfb Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 14:10:59 +0900 Subject: [PATCH 03/12] More style tweaks. --- .../parts/front-page/contributors.html | 6 +-- .../wporg-events-2023/patterns/cover.php | 36 ++++++------- .../wporg-events-2023/patterns/events.php | 2 +- .../patterns/home-page-callout.php | 23 +++------ .../postcss/base/breakpoints.pcss | 1 + .../postcss/base/layout.pcss | 4 ++ .../postcss/page/front-page/callout.pcss | 9 ++++ .../postcss/page/front-page/contributors.pcss | 5 ++ .../postcss/page/front-page/cover.pcss | 50 +++++++++++++------ .../wporg-events-2023/postcss/style.pcss | 1 + 10 files changed, 85 insertions(+), 52 deletions(-) create mode 100644 public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html index b2409686c5..8e7185bc5c 100644 --- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html +++ b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html @@ -2,11 +2,11 @@
-

Where all WordPress contributors meet

+

Where all WordPress contributors meet

- -
    + +
    • WordCamp Central ↗
      • diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php index 9a3ee8590b..475b83142e 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php @@ -8,11 +8,11 @@ ?> - -
      -
      -
      -

      Meet the community behind WordPress

      + +
      +
      +
      +

      Meet the community behind WordPress

      @@ -23,33 +23,33 @@
      - +
      + - -
      + +
      -
      -
      -

      44,744 events this year

      +
      +
      +

      44,744 events this year

      -
      -
      -

      108 countries

      +
      +
      +

      108 countries

      -
      -
      -

      540,537 members

      +
      +
      +

      540,537 members

      -
      \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/events.php b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php index ffeeaa50ec..901e7ce166 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/events.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php @@ -11,7 +11,7 @@
      -

      Upcoming Events

      +

      Upcoming events

      diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php b/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php index 21d9a33417..ace1a3f5ec 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php @@ -8,23 +8,16 @@ ?> - -
      -
      -
      -
      -

      If you can't find a WordPress event around your area, you can become an organizer - and start hosting WordPress events.

      -
      - + +
      +
      +

      Can't find a WordPress event near you? Become an organizer and start hosting local events where you live today.

      + - -
      -
      -
      Learn more
      + +
      +
      Learn more
      -
      -
      \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/base/breakpoints.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/base/breakpoints.pcss index 5b6aadee0a..962567193c 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/base/breakpoints.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/base/breakpoints.pcss @@ -23,6 +23,7 @@ * @link https://github.com/WordPress/wporg-parent-2021/blob/trunk/source/wp-content/themes/wporg-parent-2021/sass/base/_breakpoints.scss */ @custom-media --small-only (max-width: 559px); +@custom-media --medium-only (max-width: 781px); @custom-media --giant (min-width: 2000px); diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/base/layout.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/base/layout.pcss index 353cf7d2a5..9bd6d858d8 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/base/layout.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/base/layout.pcss @@ -1,3 +1,7 @@ +body { + --wp--custom--layout--wide-size: 1600px; +} + .wp-site-blocks .is-layout-constrained > :where( :not( .alignleft ):not( .alignright ):not( .alignfull ) ), .is-root-container.is-layout-constrained > :where( :not( .alignleft ):not( .alignright ):not( .alignfull ) ), .edit-post-visual-editor__post-title-wrapper > :where(:not(.alignleft):not(.alignright):not(.alignfull)) { diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss new file mode 100644 index 0000000000..acc718a37a --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss @@ -0,0 +1,9 @@ +.wporg-events__callout { + + @media (--medium-only) { + .wp-block-group { + flex-direction: column; + align-items: flex-start; + } + } +} \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss index 22d666c3a5..fb3f3994f5 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/contributors.pcss @@ -1,4 +1,9 @@ .wporg-events__contributors { + + .wp-block-heading em { + display: block; + } + .is-style-links-list li:first-child { border-top: none; } diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/cover.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/cover.pcss index 182561912c..46c59ea92a 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/cover.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/cover.pcss @@ -1,24 +1,37 @@ .wporg-events__cover { - height: 430px; - max-height: 80vh; - gap: 0; - @media (--small-only) { - height: unset; + .wp-block-columns .wp-block-column:first-child { + padding-left: var(--wp--preset--spacing--edge-space); + padding-right: var(--wp--preset--spacing--edge-space); + } + + @media (--medium) { + padding-left: var(--wp--preset--spacing--edge-space); - &.is-layout-flex { - display: block; + .wp-block-columns .wp-block-column:first-child { + padding-left: 0; + padding-right: 0; + } + + .wp-block-columns .wp-block-column:first-child > p { + max-width: 460px; } } - & .wporg-events__cover-meet-community { - gap: 0; + .wp-block-heading em { + display: block; + } - & .wporg-events__cover-stats { - padding-left: 0; - list-style-type: none; - font-family: var(--wp--preset--font-family--eb-garamond); - font-size: 26px; + @media (--huge) { + + padding-right: var(--wp--preset--spacing--edge-space); + + .wp-block-columns .wp-block-column:first-child { + flex-basis: 33% !important; + } + + .wp-block-columns .wp-block-column:last-child { + flex-basis: 66.665% !important; } } @@ -26,7 +39,14 @@ height: 430px; @media (--small-only) { - height: 170px; + height: 246px; } } } + + +@media (--medium-only) { + .wporg-events__stats .wp-block-columns { + gap: var(--wp--preset--spacing--10); + } +} \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss index 685c7b602e..ee5bd09e4b 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/style.pcss @@ -13,6 +13,7 @@ /* Pages */ @import "page/front-page/cover.pcss"; @import "page/front-page/contributors.pcss"; +@import "page/front-page/callout.pcss"; /* Blocks */ @import "blocks/wporg-google-map.pcss"; From 0d657a195b6365c40c71238bce97cf138f092a9e Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 14:50:16 +0900 Subject: [PATCH 04/12] Fix button styles. --- .../themes/wporg-events-2023/patterns/events.php | 4 ++-- .../wp-content/themes/wporg-events-2023/theme.json | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/events.php b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php index 901e7ce166..d5f34fdaa0 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/events.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php @@ -8,8 +8,8 @@ ?> - -
      + +

      Upcoming events

      diff --git a/public_html/wp-content/themes/wporg-events-2023/theme.json b/public_html/wp-content/themes/wporg-events-2023/theme.json index 5b02d0bc6d..9e80cf2c0a 100644 --- a/public_html/wp-content/themes/wporg-events-2023/theme.json +++ b/public_html/wp-content/themes/wporg-events-2023/theme.json @@ -13,6 +13,19 @@ } } } + }, + "button" : { + "typography": { + "lineHeight": "16px" + }, + "spacing": { + "padding": { + "top": "17px", + "right": "32px", + "bottom": "17px", + "left": "32px" + } + } } }, From 849c4d1ce256251431938c6f62c372c1292724da Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 15:05:12 +0900 Subject: [PATCH 05/12] Add footer template back in. --- .../wp-content/themes/wporg-events-2023/parts/footer.html | 3 +++ .../patterns/{home-page-callout.php => community-callout.php} | 2 +- .../themes/wporg-events-2023/templates/front-page.html | 4 +--- .../wp-content/themes/wporg-events-2023/templates/page.html | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 public_html/wp-content/themes/wporg-events-2023/parts/footer.html rename public_html/wp-content/themes/wporg-events-2023/patterns/{home-page-callout.php => community-callout.php} (97%) diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/footer.html b/public_html/wp-content/themes/wporg-events-2023/parts/footer.html new file mode 100644 index 0000000000..cf22f7d810 --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/parts/footer.html @@ -0,0 +1,3 @@ + + + diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php similarity index 97% rename from public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php rename to public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php index ace1a3f5ec..3f78cdd7c6 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/home-page-callout.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php @@ -2,7 +2,7 @@ - - - + diff --git a/public_html/wp-content/themes/wporg-events-2023/templates/page.html b/public_html/wp-content/themes/wporg-events-2023/templates/page.html index 89506911f5..eeef6d2e27 100644 --- a/public_html/wp-content/themes/wporg-events-2023/templates/page.html +++ b/public_html/wp-content/themes/wporg-events-2023/templates/page.html @@ -8,4 +8,4 @@ - + From 2bb433fd149dfa2952d331375ada5b1bd4728370 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 15:14:19 +0900 Subject: [PATCH 06/12] Update the stas in the cover. --- .../wp-content/themes/wporg-events-2023/patterns/cover.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php index 475b83142e..cd147d966b 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php @@ -31,7 +31,7 @@
      -

      44,744 events this year

      +

      3,925 events this year

      From eb8bc4f914961b840a10d2638ffa825081476ee1 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 15:19:57 +0900 Subject: [PATCH 07/12] Move content to .php patterns for translations to be added later --- .../parts/front-page/contributors.html | 42 ------------------- .../parts/front-page/cover.html | 34 --------------- .../parts/front-page/events.html | 21 ---------- .../templates/front-page.html | 2 +- 4 files changed, 1 insertion(+), 98 deletions(-) delete mode 100644 public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html delete mode 100644 public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html delete mode 100644 public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html deleted file mode 100644 index 8e7185bc5c..0000000000 --- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html +++ /dev/null @@ -1,42 +0,0 @@ - -
      -
      -
      -

      Where all WordPress contributors meet

      - - - - -
      - - - -
      -
      -
      -
      -
      - diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html deleted file mode 100644 index ecbfdf193d..0000000000 --- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/cover.html +++ /dev/null @@ -1,34 +0,0 @@ - -
      - -
      - -

      Meet the community behind WordPress

      - - - -

      All over the world contributors meet to share, learn, and collaborate for the WordPress project.

      - - - -
        - -
      • 3,925 events this last year
        • - - - -
      • 108 countries
        • - - - -
      • 540,537 members
        • - -
      - -
      - - - -
      - diff --git a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html b/public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html deleted file mode 100644 index 3b140906eb..0000000000 --- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/events.html +++ /dev/null @@ -1,21 +0,0 @@ - -
      - -

      - Upcoming Events

      - - - - - -
      - -
      See all - events
      - -
      - -
      - \ No newline at end of file diff --git a/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html b/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html index 143778a9fe..7e9e9a1485 100644 --- a/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html +++ b/public_html/wp-content/themes/wporg-events-2023/templates/front-page.html @@ -6,7 +6,7 @@ - + From ff6bb0b0bdd7ff0b0da0b93b2745b3161b34b0e4 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 15:20:54 +0900 Subject: [PATCH 08/12] Add newlines to php files. --- .../patterns/community-callout.php | 2 +- .../patterns/contributors.php | 52 +++++++++++++++++++ .../wporg-events-2023/patterns/cover.php | 2 +- .../wporg-events-2023/patterns/events.php | 2 +- .../patterns/local-navigation.php | 2 +- 5 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 public_html/wp-content/themes/wporg-events-2023/patterns/contributors.php diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php index 3f78cdd7c6..623537f6f9 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php @@ -20,4 +20,4 @@
      - \ No newline at end of file + diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/contributors.php b/public_html/wp-content/themes/wporg-events-2023/patterns/contributors.php new file mode 100644 index 0000000000..a5049c106e --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/contributors.php @@ -0,0 +1,52 @@ + + + + +
      +
      +
      +

      Where all WordPress contributors meet

      + + + + +
      + + + +
      +
      +
      +
      +
      + diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php index cd147d966b..56948efbfe 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php @@ -52,4 +52,4 @@
      - \ No newline at end of file + diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/events.php b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php index d5f34fdaa0..f369231ebc 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/events.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php @@ -23,4 +23,4 @@
      - \ No newline at end of file + diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php b/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php index 318a292c22..8bb4710aec 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/local-navigation.php @@ -18,4 +18,4 @@ - \ No newline at end of file + From 62d050a5633966243b33764e25b09cdc96117f3f Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 15:34:56 +0900 Subject: [PATCH 09/12] Clean up spacing. --- .../postcss/page/front-page/callout.pcss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss index acc718a37a..aa3731afe0 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/page/front-page/callout.pcss @@ -1,9 +1,9 @@ .wporg-events__callout { @media (--medium-only) { - .wp-block-group { - flex-direction: column; - align-items: flex-start; - } + .wp-block-group { + flex-direction: column; + align-items: flex-start; + } } } \ No newline at end of file From 7d9d4f0d92043cca8d252c3a67b54e1031e069f8 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 15:35:50 +0900 Subject: [PATCH 10/12] Fix footer template on page-city. --- .../wporg-events-2023/templates/page-city-landing-page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html b/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html index 05a17311db..bd1754d5a5 100644 --- a/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html +++ b/public_html/wp-content/themes/wporg-events-2023/templates/page-city-landing-page.html @@ -6,4 +6,4 @@ - + From ddf46e335f928f609384d7c70d08435b794595f3 Mon Sep 17 00:00:00 2001 From: StevenDufresne Date: Fri, 1 Dec 2023 15:40:11 +0900 Subject: [PATCH 11/12] Run the formatter. --- .../themes/wporg-events-2023/inc/city-landing-pages.php | 4 ++-- .../themes/wporg-events-2023/patterns/community-callout.php | 1 - .../themes/wporg-events-2023/patterns/contributors.php | 1 - .../wp-content/themes/wporg-events-2023/patterns/cover.php | 1 - .../wp-content/themes/wporg-events-2023/patterns/events.php | 1 - 5 files changed, 2 insertions(+), 6 deletions(-) diff --git a/public_html/wp-content/themes/wporg-events-2023/inc/city-landing-pages.php b/public_html/wp-content/themes/wporg-events-2023/inc/city-landing-pages.php index 2a7a78e842..c1f5122117 100644 --- a/public_html/wp-content/themes/wporg-events-2023/inc/city-landing-pages.php +++ b/public_html/wp-content/themes/wporg-events-2023/inc/city-landing-pages.php @@ -92,7 +92,7 @@ function prime_query_cache(): void { 'filter_slug' => FILTER_SLUG, 'start_timestamp' => 0, 'end_timestamp' => 0, - 'landing_page' => $request_uri + 'landing_page' => $request_uri, ); $cache_key = Google_Map\get_cache_key( $parts ); @@ -307,7 +307,7 @@ function get_current_landing_page(): string { * * Without this, all city pages would share the same cache key, and the wrong events would show up on most pages. */ -function add_landing_page_to_cache_key( array $items ) : array { +function add_landing_page_to_cache_key( array $items ): array { if ( is_city_landing_page() && FILTER_SLUG === $items['filter_slug'] ) { $items['landing_page'] = get_current_landing_page(); } diff --git a/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php index 623537f6f9..0018bbbb24 100644 --- a/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php @@ -1,4 +1,3 @@ - Date: Fri, 1 Dec 2023 20:27:19 +0900 Subject: [PATCH 12/12] Improve the list view. --- .../postcss/blocks/wporg-google-map.pcss | 69 +++++++++++++++---- 1 file changed, 57 insertions(+), 12 deletions(-) diff --git a/public_html/wp-content/themes/wporg-events-2023/postcss/blocks/wporg-google-map.pcss b/public_html/wp-content/themes/wporg-events-2023/postcss/blocks/wporg-google-map.pcss index 38f6b7c7f1..999f1ca96f 100644 --- a/public_html/wp-content/themes/wporg-events-2023/postcss/blocks/wporg-google-map.pcss +++ b/public_html/wp-content/themes/wporg-events-2023/postcss/blocks/wporg-google-map.pcss @@ -3,31 +3,76 @@ } .wporg-marker-list-item { - display: flex; - align-items: flex-start; - justify-content: space-between; border: 1px solid var(--wp--preset--color--light-grey-1); border-bottom: none; - padding: 20px; + padding: var(--wp--preset--spacing--20); + list-style: none; - @media (--small-only) { - display: block; + @media (--medium) { + display: grid; + align-items: start; + gap: var(--wp--preset--spacing--20); + grid-template-columns: 45% 1fr 1fr; + } + + @media (--xlarge) { + grid-template-columns: 50% 1fr 30%; + } + + @media (--huge) { + grid-template-columns: 55% 1fr 1fr; + } + + @media (--xhuge) { + grid-template-columns: 60% 1fr 1fr; } &:last-child { border-bottom: 1px solid var(--wp--preset--color--light-grey-1); } - & .wporg-marker-list-item__title { - flex: 0 0 60%; + .wporg-marker-list-item__title { + font-family: var(--wp--preset--font-family--inter); + font-size: var(--wp--preset--font-size--normal); + line-height: var(--wp--custom--body--typography--line-height); + --wp--preset--spacing--30: 0; } - & .wporg-marker-list-item__location { - flex: 0 0 15%; + .wporg-marker-list-item__date-time { + display: block; + + @media (--medium) { + text-align: right; + + .wporg-google-map__date { + display: block; + } + } + + @media (--huge) { + white-space: nowrap; + + .wporg-google-map__date { + display: inline-block; + } + } + } + + .wporg-google-map__date-time-separator { + display: none; } - & .wporg-marker-list-item__date-time { - flex: 0 0 15%; + @media (--wide) { + .wporg-marker-list-item__date-time { + display: flex; + flex-direction: row; + align-items: center; + justify-content: flex-end; + } + + .wporg-google-map__date-time-separator { + display: inline-block; + } } }