Skip to content

Commit d7b8b4a

Browse files
laurelfulfordlaurelfulford
authored
feat: add My Account button block to all header patterns (#404)
1 parent 821f81c commit d7b8b4a

8 files changed

Lines changed: 64 additions & 12 deletions

‎patterns/header/header-desktop-style-1.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<!-- /wp:buttons -->
2727

2828
<?php if ( class_exists( 'Newspack\Reader_Activation' ) && \Newspack\Reader_Activation::is_enabled() ) : ?>
29-
<!-- wp:newspack/my-account-button {"lock":{"move":true,"remove":false},"className":"has-small-size","fontSize":"x-small"} /-->
29+
<!-- wp:newspack/my-account-button {"lock":{"move":true,"remove":false},"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"base-2","textColor":"contrast","className":"has-small-size","fontSize":"x-small"} /-->
3030
<?php endif; ?>
3131
</div>
3232
<!-- /wp:group -->
@@ -41,4 +41,4 @@
4141
</div>
4242
<!-- /wp:group -->
4343
</div>
44-
<!-- /wp:group -->
44+
<!-- /wp:group -->

‎patterns/header/header-desktop-style-2.php‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,32 @@
1212
<!-- wp:group {"lock":{"move":true,"remove":true},"metadata":{"name":"<?php esc_html_e( 'Header (Desktop)', 'newspack-block-theme' ); ?>"},"style":{"spacing":{"padding":{"top":"var:preset|spacing|30","bottom":"0","right":"var:preset|spacing|30","left":"var:preset|spacing|30"},"blockGap":"var:preset|spacing|30","margin":{"bottom":"var:preset|spacing|80"}}},"backgroundColor":"base","layout":{"type":"constrained"}} -->
1313
<div class="wp-block-group has-base-background-color has-background" style="margin-bottom:var(--wp--preset--spacing--80);padding-top:var(--wp--preset--spacing--30);padding-right:var(--wp--preset--spacing--30);padding-bottom:0;padding-left:var(--wp--preset--spacing--30)">
1414

15-
<!-- wp:site-logo {"width":256,"align":"center","lock":{"move":true,"remove":true}} /-->
15+
<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->
16+
<div class="wp-block-columns alignwide are-vertically-aligned-center">
17+
<!-- wp:column {"verticalAlignment":"center"} -->
18+
<div class="wp-block-column is-vertically-aligned-center">
19+
</div>
20+
<!-- /wp:column -->
21+
22+
<!-- wp:column {"verticalAlignment":"center"} -->
23+
<div class="wp-block-column is-vertically-aligned-center">
24+
<!-- wp:site-logo {"width":256,"align":"center","lock":{"move":true,"remove":true}} /-->
25+
</div>
26+
<!-- /wp:column -->
27+
28+
<!-- wp:column {"verticalAlignment":"center"} -->
29+
<div class="wp-block-column is-vertically-aligned-center">
30+
<?php if ( class_exists( 'Newspack\Reader_Activation' ) && \Newspack\Reader_Activation::is_enabled() ) : ?>
31+
<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
32+
<div class="wp-block-group">
33+
<!-- wp:newspack/my-account-button {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"base-2","textColor":"contrast","className":"has-small-size","fontSize":"x-small"} /-->
34+
</div>
35+
<!-- /wp:group -->
36+
<?php endif; ?>
37+
</div>
38+
<!-- /wp:column -->
39+
</div>
40+
<!-- /wp:columns -->
1641

1742
<!-- wp:group {"lock":{"move":false,"remove":true},"metadata":{"name":"<?php esc_html_e( 'Menu', 'newspack-block-theme' ); ?>"},"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between","verticalAlignment":"center"}} -->
1843
<div class="wp-block-group alignwide">

‎patterns/header/header-desktop-style-3.php‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@
2828

2929
<!-- wp:column {"verticalAlignment":"center","width":"25%"} -->
3030
<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%">
31-
<!-- wp:template-part {"slug":"search-menu","theme":"newspack-block-theme","tagName":"div","align":"right","className":"search-menu"} /-->
31+
<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"right"}} -->
32+
<div class="wp-block-group">
33+
<?php if ( class_exists( 'Newspack\Reader_Activation' ) && \Newspack\Reader_Activation::is_enabled() ) : ?>
34+
<!-- wp:newspack/my-account-button {"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"base-2","textColor":"contrast","className":"has-small-size","fontSize":"x-small"} /-->
35+
<?php endif; ?>
36+
37+
<!-- wp:template-part {"slug":"search-menu","theme":"newspack-block-theme","tagName":"div","align":"right","className":"search-menu"} /-->
38+
</div>
39+
<!-- /wp:group -->
3240
</div>
3341
<!-- /wp:column -->
3442
</div>

‎patterns/header/header-desktop-style-4.php‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,21 @@
2626

2727
<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|30"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
2828
<div class="wp-block-group">
29-
<!-- wp:buttons {"lock":{"move":true,"remove":false},"className":"has-small-size","style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"fontSize":"x-small"} -->
30-
<div class="wp-block-buttons has-custom-font-size has-small-size has-x-small-font-size">
31-
<!-- wp:button -->
32-
<div class="wp-block-button">
33-
<a class="wp-block-button__link wp-element-button"><?php esc_html_e( 'Donate', 'newspack-block-theme' ); ?></a>
29+
<!-- wp:group {"style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
30+
<div class="wp-block-group">
31+
<!-- wp:buttons {"lock":{"move":true,"remove":false},"className":"has-small-size","style":{"spacing":{"blockGap":"var:preset|spacing|20"}},"fontSize":"x-small"} -->
32+
<div class="wp-block-buttons has-custom-font-size has-small-size has-x-small-font-size">
33+
<!-- wp:button -->
34+
<div class="wp-block-button"><a class="wp-block-button__link wp-element-button"><?php esc_html_e( 'Donate', 'newspack-block-theme' ); ?></a></div>
35+
<!-- /wp:button -->
3436
</div>
35-
<!-- /wp:button -->
37+
<!-- /wp:buttons -->
38+
39+
<?php if ( class_exists( 'Newspack\Reader_Activation' ) && \Newspack\Reader_Activation::is_enabled() ) : ?>
40+
<!-- wp:newspack/my-account-button {"lock":{"move":true,"remove":false},"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"base-2","textColor":"contrast","className":"has-small-size","fontSize":"x-small"} /-->
41+
<?php endif; ?>
3642
</div>
37-
<!-- /wp:buttons -->
43+
<!-- /wp:group -->
3844

3945
<!-- wp:template-part {"slug":"search-menu","theme":"newspack-block-theme","tagName":"div","align":"right","className":"search-menu"} /-->
4046
</div>

‎patterns/header/header-desktop-style-5.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@
3535
<!-- wp:group {"align":"wide","layout":{"type":"flex","flexWrap":"nowrap","justifyContent":"space-between"}} -->
3636
<div class="wp-block-group alignwide">
3737
<!-- wp:site-logo {"width":256} /-->
38+
39+
<?php if ( class_exists( 'Newspack\Reader_Activation' ) && \Newspack\Reader_Activation::is_enabled() ) : ?>
40+
<!-- wp:newspack/my-account-button {"lock":{"move":true,"remove":false},"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"base-2","textColor":"contrast","className":"has-small-size","fontSize":"x-small"} /-->
41+
<?php endif; ?>
3842
</div>
3943
<!-- /wp:group -->
4044
</div>

‎patterns/header/header-mobile-style-1.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,13 @@
3232
<!-- /wp:button -->
3333
</div>
3434
<!-- /wp:buttons -->
35+
36+
<?php if ( class_exists( 'Newspack\Reader_Activation' ) && \Newspack\Reader_Activation::is_enabled() ) : ?>
37+
<!-- wp:newspack/my-account-button {"lock":{"move":true,"remove":false},"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"base-2","textColor":"contrast","className":"has-x-small-size","fontSize":"x-small"} /-->
38+
<?php endif; ?>
3539
</div>
3640
<!-- /wp:group -->
41+
3742
</div>
3843
<!-- /wp:group -->
3944

‎patterns/header/header-mobile-style-2.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
<!-- /wp:group -->
2525

2626
</div>
27-
<!-- /wp:group -->
27+
<!-- /wp:group -->

‎patterns/header/header-mobile-style-3.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
</div>
2828
<!-- /wp:buttons -->
2929

30+
<?php if ( class_exists( 'Newspack\Reader_Activation' ) && \Newspack\Reader_Activation::is_enabled() ) : ?>
31+
<!-- wp:newspack/my-account-button {"lock":{"move":true,"remove":false},"style":{"elements":{"link":{"color":{"text":"var:preset|color|contrast"}}}},"backgroundColor":"base-2","textColor":"contrast","className":"has-x-small-size","fontSize":"x-small"} /-->
32+
<?php endif; ?>
33+
3034
<!-- wp:template-part {"slug":"mobile-menu","theme":"newspack-block-theme","tagName":"div","lock":{"move":false,"remove":true},"className":"mobile-menu"} /-->
3135
</div>
3236
<!-- /wp:group -->

0 commit comments

Comments
 (0)