Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Club: Refining spacing #6375

Merged
merged 4 commits into from
Aug 12, 2022
Merged

Club: Refining spacing #6375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d45deaf
Club: fluid settings for spacers
matiasbenedetto Aug 11, 2022
dcc473e
Merge branch 'trunk' into club/fluid-spacing
matiasbenedetto Aug 11, 2022
652ea4b
Club: refining spacing
matiasbenedetto Aug 11, 2022
fbff342
Club: archive template title as h1
matiasbenedetto Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion club/parts/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<!-- wp:group -->
<div class="wp-block-group"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
<div class="wp-block-group"><!-- wp:spacer {"height":"clamp(3rem, calc(3rem + ((1vw - 0.48rem) * 5.7692)), 6rem)"} -->
<div style="height:clamp(3rem, calc(3rem + ((1vw - 0.48rem) * 5.7692)), 6rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
<div class="wp-block-group"><!-- wp:group {"style":{"spacing":{"blockGap":"0.5rem"}},"layout":{"type":"flex","orientation":"vertical"}} -->
<div class="wp-block-group"><!-- wp:site-title {"level":2,"style":{"typography":{"lineHeight":"1.3"}},"fontSize":"large"} /-->

Expand Down
15 changes: 10 additions & 5 deletions club/parts/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- wp:group {"className":"gapless-group","layout":{"inherit":"true"}} -->
<div class="wp-block-group gapless-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"var(\u002d\u002dwp\u002d\u002dcustom\u002d\u002dgap\u002d\u002dvertical)","top":"var(\u002d\u002dwp\u002d\u002dcustom\u002d\u002dgap\u002d\u002dvertical)"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull" style="padding-top:var(--wp--custom--gap--vertical);padding-bottom:var(--wp--custom--gap--vertical)"><!-- wp:group {"layout":{"type":"flex"}} -->
<!-- wp:group {"style":{"spacing":{"blockGap":"0px"}},"className":"gapless-group","layout":{"inherit":"true"}} -->
<div class="wp-block-group gapless-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"1rem","top":"1rem"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull" style="padding-top:1rem;padding-bottom:1rem"><!-- wp:group {"layout":{"type":"flex"}} -->
<div class="wp-block-group"><!-- wp:site-logo {"width":64} /-->

<!-- wp:group -->
Expand All @@ -9,7 +9,12 @@
<!-- /wp:group -->

<!-- wp:navigation {"__unstableLocation":"primary","overlayBackgroundColor":"background","overlayTextColor":"foreground","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"}}}} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group -->


<!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"} -->
<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

</div>
<!-- /wp:group -->

7 changes: 2 additions & 5 deletions club/patterns/404.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
?>

<!-- wp:group {"tagName":"main"} -->
<main class="wp-block-group"><!-- wp:spacer {"height":"4rem"} -->
<div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
<main class="wp-block-group"><!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 4rem)"} -->
<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 4rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:heading {"textAlign":"left","level":1,"style":{"typography":{"textTransform":"uppercase"}}} -->
Expand All @@ -22,7 +22,4 @@

<!-- wp:pattern {"slug":"club/search"} /-->

<!-- wp:spacer {"height":"4rem"} -->
<div style="height:4rem" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer --></main>
<!-- /wp:group -->
4 changes: 0 additions & 4 deletions club/patterns/post-list.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,4 @@
<!-- wp:query-pagination-next /-->
<!-- /wp:query-pagination --></main>

<!-- wp:spacer -->
<div style="height:100px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- /wp:query -->
6 changes: 5 additions & 1 deletion club/templates/archive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<!-- wp:template-part {"slug":"header","tagName":"header"} /-->

<!-- wp:query-title {"type":"archive","level":2} /-->
<!-- wp:query-title {"type":"archive"} /-->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed on mobile this increase in font size may easily cut off the word / push beyond the width of the screen:

Screen Shot 2022-08-11 at 3 29 35 PM

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using the font size from the design there.


<!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"} -->
<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:pattern {"slug":"club/posts-list"} /-->

Expand Down
4 changes: 2 additions & 2 deletions club/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- wp:template-part {"slug":"header","tagName":"header"} /-->

<!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"-1em","top":"0em"}}},"className":"alignfull"} -->
<hr class="wp-block-separator has-alpha-channel-opacity alignfull" style="margin-top:0em;margin-bottom:-1em"/>
<!-- wp:separator {"style":{"spacing":{"margin":{"bottom":"calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem))","top":"calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem))"}}},"className":"alignfull"} -->
<hr class="wp-block-separator has-alpha-channel-opacity alignfull" style="margin-top:calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem));margin-bottom:calc(-1 * clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem))"/>
<!-- /wp:separator -->

<!-- wp:pattern {"slug":"club/posts-list"} /-->
Expand Down
9 changes: 7 additions & 2 deletions club/templates/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@
<!-- wp:group {"layout":{"inherit":false}} -->
<div class="wp-block-group">

<!-- wp:spacer {"height":"clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"} -->
<div style="height:clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:pattern {"slug":"club/search"} /-->

<!-- wp:spacer {"height":"40px"} -->
<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- wp:spacer {"height":"clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)"} -->
<div style="height:clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer --></div>

<!-- /wp:group -->

<!-- wp:pattern {"slug":"club/posts-list"} /-->
Expand Down
8 changes: 4 additions & 4 deletions club/templates/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<!-- /wp:column --></div>
<!-- /wp:columns -->

<!-- wp:spacer {"height":"40px"} -->
<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- wp:spacer {"height":"clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)"} -->
<div style="height:clamp(1.5rem, calc(1.5rem + ((1vw - 0.48rem) * 5.7692)), 3rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->


Expand All @@ -51,8 +51,8 @@
<!-- /wp:group -->


<!-- wp:spacer {"height":"40px"} -->
<div style="height:40px" aria-hidden="true" class="wp-block-spacer"></div>
<!-- wp:spacer {"height":"clamp(0rem, calc(0rem + ((1vw - 0.48rem) * 5.7692)), 1rem)"} -->
<div style="height:clamp(0rem, calc(0rem + ((1vw - 0.48rem) * 5.7692)), 1rem)" aria-hidden="true" class="wp-block-spacer"></div>
<!-- /wp:spacer -->

<!-- wp:columns -->
Expand Down
16 changes: 9 additions & 7 deletions club/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,11 +366,6 @@
"style": "solid",
"width": "0"
},
"spacing": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just want to make sure this is intentional to remove this? I think it looks better but wasn't sure if it's a part of this PR.

Copy link
Member Author

@matiasbenedetto matiasbenedetto Aug 11, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, it's intentional double spacing at the left of the quote.

"padding": {
"left": "var(--wp--custom--gap--horizontal)"
}
},
"typography": {
"fontSize": "var(--wp--preset--font-size--large)",
"fontStyle": "normal"
Expand Down Expand Up @@ -411,8 +406,15 @@
},
"elements": {
"button": {
"spacing": {
"padding": {
"top": "1rem",
"bottom": "1rem"
}
},
"typography": {
"fontSize": "var(--wp--preset--font-size--large)"
"fontSize": "var(--wp--preset--font-size--large)",
"lineHeight": "1.25"
}
}
}
Expand Down Expand Up @@ -605,7 +607,7 @@
}
},
"spacing": {
"blockGap": "30px"
"blockGap": "clamp(1rem, calc(1rem + ((1vw - 0.48rem) * 5.7692)), 2rem)"
},
"typography": {
"fontFamily": "var(--wp--preset--font-family--spacemono)",
Expand Down