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/parts/footer.html b/public_html/wp-content/themes/wporg-events-2023/parts/footer.html index 2161a7b750..cf22f7d810 100644 --- a/public_html/wp-content/themes/wporg-events-2023/parts/footer.html +++ b/public_html/wp-content/themes/wporg-events-2023/parts/footer.html @@ -1,20 +1,3 @@ - -
- -

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 deleted file mode 100644 index 4358bc0eea..0000000000 --- a/public_html/wp-content/themes/wporg-events-2023/parts/front-page/contributors.html +++ /dev/null @@ -1,43 +0,0 @@ - -
- -
- -

Where all WordPress contributors meet

- - - - - -
- - - -
- \ No newline at end of file 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.

- - - - - -
- - - -
- 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/patterns/community-callout.php b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php new file mode 100644 index 0000000000..0018bbbb24 --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/community-callout.php @@ -0,0 +1,22 @@ + + + +
+
+

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

+ + + +
+
Learn more
+
+
+
+ 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..35849a1b99 --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/contributors.php @@ -0,0 +1,51 @@ + + + +
+
+
+

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 new file mode 100644 index 0000000000..13d3630101 --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/cover.php @@ -0,0 +1,54 @@ + + + +
+
+
+

Meet the community behind WordPress

+ + + +

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

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

3,925 events this year

+
+
+ + + +
+
+

108 countries

+
+
+ + + +
+
+

540,537 members

+
+
+
+
+ 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..27d2c1e591 --- /dev/null +++ b/public_html/wp-content/themes/wporg-events-2023/patterns/events.php @@ -0,0 +1,25 @@ + + + +
+
+

Upcoming events

+ + + + + +
+
See all + events
+
+
+
+ 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..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 @@ -14,8 +14,8 @@ ?> - + - + 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/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; + } } } 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..aa3731afe0 --- /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 10e0633bd2..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,16 +1,22 @@ .wporg-events__contributors { - @media (--phone-tablet) { - &.is-layout-flex { - display: block; - } + .wp-block-heading em { + 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/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 06cb636dd5..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 @@ -9,11 +9,11 @@ /* Base */ @import "base/breakpoints.pcss"; @import "base/layout.pcss"; -@import "base/footer.pcss"; /* 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"; 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..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 @@ -2,11 +2,11 @@
- + - + - +
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" + } + } } },