Skip to content

Commit

Permalink
Merge branch 'main' into feature/WDSUS-35-Fix-block-category-duplication
Browse files Browse the repository at this point in the history
  • Loading branch information
khleomix committed Aug 7, 2023
2 parents bb05241 + 56bab47 commit 8d899c0
Show file tree
Hide file tree
Showing 12 changed files with 133 additions and 85 deletions.
44 changes: 0 additions & 44 deletions inc/hooks/wrap-core-blocks.php

This file was deleted.

15 changes: 0 additions & 15 deletions parts/content.html

This file was deleted.

10 changes: 1 addition & 9 deletions parts/footer.html
Original file line number Diff line number Diff line change
@@ -1,9 +1 @@
<!-- wp:group {"tagName":"footer","style":{"elements":{"link":{"color":{"text":"var:preset|color|tertiary-300"}}},"spacing":{"blockGap":"var:preset|spacing|40"}},"backgroundColor":"primary-300","textColor":"secondary-100","layout":{"type":"constrained","wideSize":"100vw"}} -->
<footer class="wp-block-group has-secondary-100-color has-primary-300-background-color has-text-color has-background has-link-color"><!-- wp:image {"align":"center","id":189,"width":150,"sizeSlug":"medium","linkDestination":"none"} -->
<figure class="wp-block-image aligncenter size-medium is-resized"><img src="/wp-content/themes/wd_f/src/images/wds-light-transparent-300x76.png" alt="" class="wp-image-189" width="150"/></figure>
<!-- /wp:image -->

<!-- wp:paragraph {"align":"center","fontSize":"small"} -->
<p class="has-text-align-center has-small-font-size">Proudly powered by WordPress. Hosted by WP Engine. WebDevStudios is a <strong><a href="https://wd3.co/">WD3</a></strong> Party</p>
<!-- /wp:paragraph --></footer>
<!-- /wp:group -->
<!-- wp:pattern {"slug":"wds/footer"} /-->
14 changes: 1 addition & 13 deletions parts/header.html
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
<!-- wp:group {"tagName":"header","style":{"spacing":{"margin":{"top":"var:preset|spacing|30","bottom":"var:preset|spacing|30"}}},"layout":{"type":"constrained","wideSize":"100vw","contentSize":"80vw"}} -->
<header class="wp-block-group" style="margin-top:var(--wp--preset--spacing--30);margin-bottom:var(--wp--preset--spacing--30)"><!-- wp:columns {"verticalAlignment":"center"} -->
<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"50%","layout":{"type":"constrained"}} -->
<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
<div class="wp-block-group"><!-- wp:site-logo {"width":200,"shouldSyncIcon":true} /--></div>
<!-- /wp:group --></div>
<!-- /wp:column -->

<!-- wp:column {"verticalAlignment":"center","width":"50%","layout":{"type":"constrained"}} -->
<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:navigation {"ref":187,"overlayBackgroundColor":"secondary-200","overlayTextColor":"primary-300","layout":{"type":"flex","justifyContent":"right"},"style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"fontSize":"medium"} /--></div>
<!-- /wp:column --></div>
<!-- /wp:columns --></header>
<!-- /wp:group -->
<!-- wp:pattern {"slug":"wds/header"} /-->
18 changes: 18 additions & 0 deletions patterns/footer.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
/**
* Title: Footer
* Slug: wds/footer
* Description: Footer with site logo and menus.
* Categories: footer
* Block Types: core/template-part/footer
*/
?>
<!-- wp:group {"tagName":"footer","style":{"elements":{"link":{"color":{"text":"var:preset|color|tertiary-300"}}},"spacing":{"blockGap":"var:preset|spacing|40"}},"backgroundColor":"primary-300","textColor":"secondary-100","layout":{"type":"constrained","wideSize":"100vw"}} -->
<footer class="wp-block-group has-secondary-100-color has-primary-300-background-color has-text-color has-background has-link-color"><!-- wp:image {"align":"center","id":189,"width":150,"sizeSlug":"medium","linkDestination":"none"} -->
<figure class="wp-block-image aligncenter size-medium is-resized"><img src="<?php echo esc_url( get_theme_file_uri( 'src/images/wds-light-transparent-300x76.png' ) ) ?>" alt="" class="wp-image-189" width="150"/></figure>
<!-- /wp:image -->

<!-- wp:paragraph {"align":"center","fontSize":"small"} -->
<p class="has-text-align-center has-small-font-size">Proudly powered by WordPress. Hosted by WP Engine. WebDevStudios is a <strong><a href="https://wd3.co/">WD3</a></strong> Party</p>
<!-- /wp:paragraph --></footer>
<!-- /wp:group -->
22 changes: 22 additions & 0 deletions patterns/header.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<?php
/**
* Title: Header
* Slug: wds/header
* Description: Header with site logo and navigation.
* Categories: header
* Block Types: core/template-part/header
*/
?>
<!-- wp:group {"tagName":"header","style":{"spacing":{"margin":{"top":"0","bottom":"0"}}},"backgroundColor":"primary-300","textColor":"secondary-100","layout":{"type":"constrained","wideSize":"100vw","contentSize":"80vw"}} -->
<header class="wp-block-group has-secondary-100-color has-primary-300-background-color has-text-color has-background" style="margin-top:0;margin-bottom:0"><!-- wp:columns {"verticalAlignment":"center"} -->
<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"50%","layout":{"type":"constrained"}} -->
<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:image {"align":"center","id":189,"width":150,"sizeSlug":"medium","linkDestination":"none"} -->
<figure class="wp-block-image aligncenter size-medium is-resized"><img src="<?php echo esc_url( get_theme_file_uri( 'src/images/wds-light-transparent-300x76.png' ) ) ?>" alt="" class="wp-image-189" width="150"/></figure>
<!-- /wp:image --></div>
<!-- /wp:column -->

<!-- wp:column {"verticalAlignment":"center","width":"50%","layout":{"type":"constrained"}} -->
<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:navigation {"ref":187,"overlayBackgroundColor":"secondary-200","overlayTextColor":"primary-300","layout":{"type":"flex","justifyContent":"right"},"style":{"spacing":{"blockGap":"var:preset|spacing|50"}},"fontSize":"medium"} /--></div>
<!-- /wp:column --></div>
<!-- /wp:columns --></header>
<!-- /wp:group -->
34 changes: 34 additions & 0 deletions patterns/query.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php
/**
* Title: Default Query
* Slug: wds/query
* Description: Query of posts in stack view.
* Categories: hidden
* Inserter: false
*/
?>
<!-- wp:query {"queryId":0,"query":{"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","type":"constrained","inherit":true,"perPage":1},"displayLayout":{"type":"list"},"layout":{"type":"default"}} -->
<div class="wp-block-query">
<!-- wp:post-template -->
<!-- wp:group {"style":{"spacing":{"blockGap":"10px"}}} -->
<div class="wp-block-group">
<!-- wp:post-title {"isLink":true} /-->
<!-- wp:group {"style":{"spacing":{"blockGap":"5px","margin":{"bottom":"30px"}}},"layout":{"type":"flex"},"fontSize":"small"} -->
<div class="wp-block-group has-small-font-size" style="margin-bottom:30px">
<!-- wp:post-date /-->
<!-- wp:paragraph -->
<p>·</p>
<!-- /wp:paragraph -->
<!-- wp:post-author-name {"isLink":true} /-->
</div>
<!-- /wp:group -->
</div>
<!-- /wp:group -->
<!-- wp:post-excerpt {"moreText":"Read More"} /-->
<!-- /wp:post-template -->
<!-- wp:query-pagination -->
<!-- wp:query-pagination-previous /-->
<!-- wp:query-pagination-next /-->
<!-- /wp:query-pagination -->
</div>
<!-- /wp:query -->
5 changes: 5 additions & 0 deletions templates/blank.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<!-- wp:group {"tagName":"main"} -->
<main class="wp-block-group">
<!-- wp:post-content {"layout":{"type":"constrained"}} /-->
</main>
<!-- /wp:group -->
19 changes: 16 additions & 3 deletions templates/index.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
<!-- wp:template-part {"slug":"header"} /-->
<!-- wp:template-part {"slug":"content"} /-->
<!-- wp:template-part {"slug":"footer"} /-->
<!-- wp:template-part {"slug":"header","theme":"wd_f"} /-->

<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"0"},"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}},"layout":{"type":"constrained"}} -->
<main
class="wp-block-group"
style="
margin-top: 0;
padding-top: var( --wp--preset--spacing--70 );
padding-bottom: var( --wp--preset--spacing--70 );
"
>
<!-- wp:pattern {"slug":"wds/query", "layout":"constrained"} /-->
</main>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","theme":"wd_f"} /-->
13 changes: 13 additions & 0 deletions templates/no-title.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} -->
<main
class="wp-block-group"
style="
padding-top: var( --wp--preset--spacing--70 );
padding-bottom: var( --wp--preset--spacing--70 );
"
>
<!-- wp:post-content {"layout":{"type":"constrained"}} /-->
</main>
<!-- /wp:group -->
<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
18 changes: 18 additions & 0 deletions templates/page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<!-- wp:template-part {"slug":"header","tagName":"header","className":"site-header"} /-->
<!-- wp:group {"tagName":"main","style":{"spacing":{"margin":{"top":"0"},"padding":{"top":"var:preset|spacing|70","bottom":"var:preset|spacing|70"}}}} -->
<main
class="wp-block-group"
style="
margin-top: 0;
padding-top: var( --wp--preset--spacing--70 );
padding-bottom: var( --wp--preset--spacing--70 );
"
>
<!-- wp:group {"layout":{"type":"constrained"}} -->
<div class="wp-block-group"><!-- wp:post-title {"level":1} /--></div>
<!-- /wp:group -->

<!-- wp:post-content {"layout":{"type":"constrained"}} /-->
</main>
<!-- /wp:group -->
<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer"} /-->
6 changes: 5 additions & 1 deletion theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,11 @@
"customTemplates": [
{
"name": "blank",
"title": "Blank Tempate"
"title": "Blank"
},
{
"name": "no-title",
"title": "No Title"
}
],
"version": 2,
Expand Down

0 comments on commit 8d899c0

Please sign in to comment.