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

Jump to bottom

Rainfall: address header and footer improvements #6305

Merged
merged 11 commits into from
Aug 4, 2022
Merged

Rainfall: address header and footer improvements #6305

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d3479fc
Make header and footer full width
mikachan Jul 25, 2022
f0b5477
Make all text in footer uppercase
mikachan Jul 25, 2022
40e495b
Allow footer content to wrap at smaller screens
mikachan Jul 25, 2022
3e7a03d
Style navigation overlay
mikachan Jul 25, 2022
30ff68d
Style overlay menu trigger
mikachan Aug 1, 2022
35e0e99
Add header/footer tag names
mikachan Aug 1, 2022
30b430c
Replace footer links with nav block
mikachan Aug 1, 2022
c29a741
Tweak footer nav styling
mikachan Aug 1, 2022
a232e2c
Style current menu item; add GB issues
mikachan Aug 1, 2022
0bb5a4a
remove link color from group
scruffian Aug 2, 2022
837dbd7
Merge branch 'trunk' into fix/rainfall-6245
mikachan Aug 4, 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
18 changes: 4 additions & 14 deletions rainfall/parts/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,9 @@
<!-- wp:group {"layout":{"inherit":"true"}} -->
<div class="wp-block-group"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
<div class="wp-block-group alignwide" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","fontSize":"small"} /-->
<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"30px","bottom":"60px"}}},"layout":{"type":"flex","flexWrap":"wrap","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:60px"><!-- wp:site-title {"textAlign":"left","style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->

<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
<div class="wp-block-group"><!-- wp:paragraph -->
<p><a href="https://facebook.com/">Facebook</a></p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"align":"right"} -->
<p class="has-text-align-right"><a href="https://instagram.com/">Instagram</a></p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"align":"center"} -->
<p class="has-text-align-center"><a href="https://twitter.com/">Twitter</a></p>
<!-- /wp:paragraph --></div>
<!-- wp:group {"layout":{"type":"flex","flexWrap":"wrap","orientation":"horizontal"}} -->
<div class="wp-block-group"><!-- wp:navigation {"overlayMenu":"never","layout":{"type":"flex","justifyContent":"left"},"style":{"typography":{"textTransform":"uppercase"}}} /--></div>
<!-- /wp:group --></div>
<!-- /wp:group --></div>
<!-- /wp:group -->
6 changes: 3 additions & 3 deletions rainfall/parts/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!-- wp:group {"layout":{"inherit":"true"}} -->
<div class="wp-block-group"><!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"bottom":"30px","top":"30px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
<div class="wp-block-group alignwide" style="padding-top:30px;padding-bottom:30px"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->
<div class="wp-block-group"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"30px","top":"30px"}}},"layout":{"type":"flex","justifyContent":"space-between"}} -->
<div class="wp-block-group alignfull" style="padding-top:30px;padding-bottom:30px"><!-- wp:site-title {"style":{"typography":{"textTransform":"uppercase"}},"fontSize":"small"} /-->

<!-- wp:navigation {"layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"right","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"2.87rem"}}} /--></div>
<!-- wp:navigation {"hasIcon":false,"overlayBackgroundColor":"black","overlayTextColor":"white","layout":{"type":"flex","setCascadingProperties":true,"justifyContent":"left","orientation":"horizontal"},"style":{"spacing":{"margin":{"top":"0"},"blockGap":"2.87rem"},"typography":{"textTransform":"uppercase"}}} /--></div>
<!-- /wp:group -->

<!-- wp:spacer {"height":"60px"} -->
Expand Down
28 changes: 28 additions & 0 deletions rainfall/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,31 @@ body > .is-root-container > .wp-block-template-part > .wp-block-cover,
margin-right: auto !important;
width: inherit;
}

/* Footer Navigation */
footer .wp-block-navigation__container {
row-gap: 1rem;
}

/** Navigation Current Menu Item
* Needed until this is addressed: https://github.com/WordPress/gutenberg/issues/42299
*/
.wp-block-navigation-item.current-menu-item > a {
font-weight: 700;
}

/** Navigation Overlay
* Needed until this is addressed: https://github.com/WordPress/gutenberg/issues/39142
*/
.wp-block-navigation__responsive-container.is-menu-open ul {
font-size: var(--wp--preset--font-size--x-large) !important;
gap: 0 !important;
}

.wp-block-navigation__responsive-container.is-menu-open .has-child .wp-block-navigation__submenu-container {
padding-top: 0;
}

.wp-block-navigation__responsive-container-open {
text-transform: uppercase;
}
4 changes: 2 additions & 2 deletions rainfall/templates/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!-- wp:group {"backgroundColor":"light-orange"} -->
<div class="wp-block-group has-light-orange-background-color has-background">
<!-- wp:template-part {"slug":"header"} /-->
<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
</div>
<!-- /wp:group -->

Expand All @@ -10,4 +10,4 @@
</main>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer"} /-->
<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
6 changes: 3 additions & 3 deletions rainfall/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!-- wp:group {"style":{"elements":{"link":{"color":{"text":"var:preset|color|black"}}}},"backgroundColor":"light-orange","textColor":"black"} -->
<div class="wp-block-group has-black-color has-light-orange-background-color has-text-color has-background has-link-color"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->
<!-- wp:group {"backgroundColor":"light-orange"} -->
<div class="wp-block-group has-light-orange-background-color has-background"><!-- wp:template-part {"slug":"header","tagName":"header"} /-->

<!-- wp:group {"layout":{"inherit":true}} -->
<div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
Expand All @@ -22,4 +22,4 @@

<!-- wp:template-part {"slug":"query"} /-->

<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
2 changes: 1 addition & 1 deletion rainfall/templates/page-header-black.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@
<!-- /wp:columns --></div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer"} /-->
<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
4 changes: 2 additions & 2 deletions rainfall/templates/page-no-sidebar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"header"} /-->
<!-- wp:template-part {"slug":"header","tagName":"header"} /-->

<!-- wp:group {"layout":{"inherit":true}} -->
<div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
Expand Down Expand Up @@ -33,4 +33,4 @@
</div>
<!-- /wp:group -->

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

<!-- wp:group {"layout":{"inherit":true}} -->
<div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
Expand Down Expand Up @@ -38,4 +38,4 @@
<!-- /wp:columns --></div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer"} /-->
<!-- wp:template-part {"slug":"footer","tagName":"footer"} /-->
8 changes: 4 additions & 4 deletions rainfall/templates/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- wp:template-part {"slug":"header"} /-->
<!-- wp:template-part {"slug":"header","tagName":"header"} /-->

<!-- wp:group {"layout":{"inherit":true}} -->
<div class="wp-block-group"><!-- wp:group {"align":"wide"} -->
Expand Down Expand Up @@ -93,9 +93,9 @@
<div class="wp-block-group"></div>
<!-- /wp:group -->

<!-- wp:columns {"align":"wide"} -->
<div class="wp-block-columns alignwide"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:template-part {"slug":"footer"} /--></div>
<!-- wp:columns {"align":"full"} -->
<div class="wp-block-columns alignfull"><!-- wp:column -->
<div class="wp-block-column"><!-- wp:template-part {"slug":"footer","tagName":"footer"} /--></div>
<!-- /wp:column --></div>
<!-- /wp:columns --></div>
<!-- /wp:group -->