Skip to content

Commit

Permalink
Merge branch 'trunk' into feature/frontend-improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
Imran92 committed Oct 17, 2023
2 parents f486ab2 + 9140243 commit 2b91c35
Show file tree
Hide file tree
Showing 184 changed files with 3,634 additions and 269 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/gardening.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,6 @@ jobs:
slack_team_channel: ${{ secrets.SLACK_TEAM_CHANNEL }}
slack_he_triage_channel: ${{ secrets.SLACK_HE_TRIAGE_CHANNEL }}
slack_quality_channel: ${{ secrets.SLACK_QUALITY_CHANNEL }}
tasks: 'cleanLabels,flagOss,triageIssues,gatherSupportReferences,replyToCustomersReminder'
triage_projects_token: ${{ secrets.PROJECT_AUTOMATION_TOKEN }}
project_board_url: ${{ secrets.PROJECT_BOARD_URL }}
tasks: 'cleanLabels,flagOss,triageIssues,gatherSupportReferences,replyToCustomersReminder,updateBoard'
1 change: 1 addition & 0 deletions aldente/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: aldente
Tags: blog, grid-layout, two-columns, four-columns, right-sidebar, block-patterns, block-styles, editor-style, featured-images, full-site-editing, rtl-language-support, template-editing, threaded-comments, translation-ready, news, one-column, wide-blocks, custom-background, custom-colors, custom-logo, custom-menu, theme-options
Status: inactive
*/

/*
Expand Down
6 changes: 6 additions & 0 deletions awburn/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ Awburn is the ideal choice for creating an online presence for your business. As

== Changelog ==

= 1.0.4 =
* Awburn: Make sure full width elements stretch edge to edge. This also fix 404 template. (#7380)

= 1.0.3 =
* Awburn: set as inactive (#7405)

= 1.0.2 =
* Swap home page content. (#7352)

Expand Down
3 changes: 2 additions & 1 deletion awburn/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ Description: Awburn is the ideal choice for creating an online presence for your
Requires at least: 5.8
Tested up to: 6.3
Requires PHP: 5.7
Version: 1.0.2
Version: 1.0.4
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: awburn
Tags: blog, news, portfolio, one-column, three-columns, wide-blocks, block-patterns, custom-colors, custom-logo, custom-menu, editor-style, featured-images, full-site-editing, rtl-language-support, style-variations, template-editing, theme-options, threaded-comments, translation-ready, awburn
Status: inactive
*/

/*
Expand Down
8 changes: 4 additions & 4 deletions awburn/templates/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<div class="wp-block-group" style="border-top-color:var(--wp--preset--color--secondary);border-top-style:solid;border-top-width:10px"><!-- wp:template-part {"slug":"header","tagName":"header"} /--></div>
<!-- /wp:group -->

<!-- wp:pattern {"slug":"awburn/hidden-no-results-content"} /-->
<!-- wp:group {"tagName":"main","style":{"spacing":{"padding":{"top":"60px","right":"40px","left":"40px"}}},"layout":{"type":"constrained"}} -->
<main class="wp-block-group" style="padding-top:60px;padding-right:40px;padding-left:40px"><!-- wp:pattern {"slug":"awburn/hidden-no-results-content"} /-->

<!-- wp:search {"showLabel":false,"buttonPosition":"button-inside","buttonUseIcon":true,"style":{"border":{"radius":"2px","top":{"color":"#dfdfdf","style":"solid","width":"1px"},"right":{"color":"#dfdfdf","style":"solid","width":"1px"},"bottom":{"color":"#dfdfdf","style":"solid","width":"1px"},"left":{"color":"#dfdfdf","style":"solid","width":"1px"}}},"backgroundColor":"primary","textColor":"background"} /--></div>
<!-- /wp:group --></main>
<!-- wp:search {"showLabel":false,"buttonPosition":"button-inside","buttonUseIcon":true,"style":{"border":{"radius":"2px","top":{"color":"#dfdfdf","style":"solid","width":"1px"},"right":{"color":"#dfdfdf","style":"solid","width":"1px"},"bottom":{"color":"#dfdfdf","style":"solid","width":"1px"},"left":{"color":"#dfdfdf","style":"solid","width":"1px"}}},"backgroundColor":"primary","textColor":"background"} /--></main>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer","area":"footer"} /-->
<!-- wp:template-part {"slug":"footer","area":"footer"} /-->
6 changes: 3 additions & 3 deletions awburn/templates/page.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

<!-- wp:post-featured-image /-->

<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"left":"40px","right":"40px"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignfull" style="padding-right:40px;padding-left:40px"><!-- wp:post-content {"lock":{"move":false,"remove":false},"align":"full","layout":{"type":"constrained"}} /--></div>
<!-- wp:group {"align":"full","layout":{"type":"constrained"}} -->
<div class="wp-block-group alignfull"><!-- wp:post-content {"lock":{"move":false,"remove":false},"align":"full","layout":{"type":"constrained"}} /--></div>
<!-- /wp:group -->

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

<!-- wp:template-part {"slug":"footer","align":"full"} /-->
<!-- wp:template-part {"slug":"footer","align":"full"} /-->
6 changes: 3 additions & 3 deletions awburn/templates/single.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

<!-- wp:post-featured-image /-->

<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"left":"40px","right":"40px","bottom":"40px","top":"40px"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignfull" style="padding-top:40px;padding-right:40px;padding-bottom:40px;padding-left:40px"><!-- wp:post-content {"lock":{"move":false,"remove":false},"align":"full","layout":{"type":"constrained"}} /--></div>
<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"bottom":"40px","top":"40px"}}},"layout":{"type":"constrained"}} -->
<div class="wp-block-group alignfull" style="padding-top:40px;padding-bottom:40px"><!-- wp:post-content {"lock":{"move":false,"remove":false},"align":"full","layout":{"type":"constrained"}} /--></div>
<!-- /wp:group -->

<!-- wp:spacer {"height":"40px"} -->
Expand All @@ -42,4 +42,4 @@
<!-- /wp:spacer --></div>
<!-- /wp:group -->

<!-- wp:template-part {"slug":"footer"} /-->
<!-- wp:template-part {"slug":"footer"} /-->
2 changes: 1 addition & 1 deletion barnsbury23/patterns/front-page.php
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@

<!-- wp:column {"width":"66.6%","layout":{"type":"constrained","justifyContent":"left"}} -->
<div class="wp-block-column" style="flex-basis:66.6%"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png","dimRatio":0,"minHeight":520,"minHeightUnit":"px"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background wp-image-463" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size"></p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover -->
Expand Down
2 changes: 1 addition & 1 deletion barnsbury23/patterns/hero-green.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

<!-- wp:column {"verticalAlignment":"center","width":"50%"} -->
<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_hero.jpg","dimRatio":0,"minHeight":520,"style":{"color":[]}} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background wp-image-621" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_hero.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_hero.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size"></p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover --></div>
Expand Down
2 changes: 1 addition & 1 deletion barnsbury23/patterns/home-clean.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<!-- wp:column {"verticalAlignment":"center","width":"50%"} -->
<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:50%"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_hero.jpg","dimRatio":0,"minHeight":520} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background wp-image-621" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_hero.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_hero.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size"></p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover --></div>
Expand Down
2 changes: 1 addition & 1 deletion barnsbury23/patterns/home.php
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@

<!-- wp:column {"width":"66.6%","layout":{"type":"constrained","justifyContent":"left"}} -->
<div class="wp-block-column" style="flex-basis:66.6%"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png","dimRatio":0,"minHeight":520,"minHeightUnit":"px"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background wp-image-463" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size"></p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover -->
Expand Down
2 changes: 1 addition & 1 deletion barnsbury23/patterns/numbers-clean.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<!-- wp:column {"width":"66.6%","layout":{"type":"constrained","justifyContent":"left"}} -->
<div class="wp-block-column" style="flex-basis:66.6%"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png","dimRatio":0,"minHeight":520,"minHeightUnit":"px"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background wp-image-463" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/barnsbury_the-farm.png" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size"></p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover -->
Expand Down
2 changes: 1 addition & 1 deletion barnsbury23/patterns/numbers-green.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@

<!-- wp:column {"width":"66.6%","layout":{"type":"constrained","justifyContent":"left"}} -->
<div class="wp-block-column" style="flex-basis:66.6%"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_farm.jpg","dimRatio":0,"minHeight":520,"minHeightUnit":"px"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background wp-image-620" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_farm.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<div class="wp-block-cover" style="min-height:520px"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-0 has-background-dim"></span><img class="wp-block-cover__image-background" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/b-original_farm.jpg" data-object-fit="cover"/><div class="wp-block-cover__inner-container"><!-- wp:paragraph {"align":"center","placeholder":"<?php echo esc_attr__( 'Write title…', 'barnsbury23' ); ?>","fontSize":"large"} -->
<p class="has-text-align-center has-large-font-size"></p>
<!-- /wp:paragraph --></div></div>
<!-- /wp:cover -->
Expand Down
4 changes: 2 additions & 2 deletions barnsbury23/patterns/post-meta.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
<!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"1.5rem"}},"layout":{"type":"flex","flexWrap":"nowrap"}} -->
<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5rem"}},"layout":{"type":"flex","flexWrap":"nowrap","verticalAlignment":"bottom"}} -->
<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:image {"sizeSlug":"full","linkDestination":"none","style":{"layout":{"selfStretch":"fixed","flexSize":"24px"}}} -->
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/ic_date.png" alt="" class="wp-image-334"/></figure>
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/ic_date.png" alt=""/></figure>
<!-- /wp:image -->

<!-- wp:post-date {"format":"F j, Y","isLink":true,"style":{"typography":{"textTransform":"uppercase","fontStyle":"normal","fontWeight":"400","fontSize":"0.9rem","letterSpacing":"5%","lineHeight":"1.7"}},"fontFamily":"rubik"} /--></div>
<!-- /wp:group -->

<!-- wp:group {"style":{"spacing":{"padding":{"top":"0px","right":"0px","bottom":"0px","left":"0px"},"margin":{"top":"0px","bottom":"0px"},"blockGap":"0.5rem"}},"layout":{"type":"flex","flexWrap":"nowrap","verticalAlignment":"bottom"}} -->
<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px;padding-top:0px;padding-right:0px;padding-bottom:0px;padding-left:0px"><!-- wp:image {"sizeSlug":"full","linkDestination":"none","style":{"layout":{"selfStretch":"fixed","flexSize":"24px"}}} -->
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/ic_category.png" alt="" class="wp-image-333"/></figure>
<figure class="wp-block-image size-full"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ); ?>/assets/images/ic_category.png" alt=""/></figure>
<!-- /wp:image -->

<!-- wp:post-terms {"term":"category","style":{"typography":{"textTransform":"uppercase","fontStyle":"normal","fontWeight":"400","fontSize":"0.9rem","letterSpacing":"5%","lineHeight":"1.7"}},"fontFamily":"rubik"} /--></div>
Expand Down
Loading

0 comments on commit 2b91c35

Please sign in to comment.