Merge branch 'wpengine-trunk-1.0.5' into trunk

linchpin · Jul 28, 2023 · 9d4ccd7 · 9d4ccd7
2 parents fd26637 + 3ff8562
commit 9d4ccd7
Show file tree

Hide file tree

Showing 43 changed files with 953 additions and 890 deletions.
diff --git a/parts/comments.html b/parts/comments.html
diff --git a/...eneral-author-box-contrast-background.php → patterns/author-box-dark.php b/...eneral-author-box-contrast-background.php → patterns/author-box-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Box with image, text, social icons.
- * Slug: frost/general-author-box-contrast-background
+ * Slug: frost/author-box-dark
  * Categories: call-to-action
  */
 ?>

diff --git a/patterns/general-author-box.php → patterns/author-box.php b/patterns/general-author-box.php → patterns/author-box.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Box with image, text, social icons.
- * Slug: frost/general-author-box
+ * Slug: frost/author-box
  * Categories: call-to-action
  */
 ?>

diff --git a/...neral-boxes-three-contrast-background.php → patterns/boxes-three-dark.php b/...neral-boxes-three-contrast-background.php → patterns/boxes-three-dark.php
@@ -2,7 +2,7 @@
 
 /**
  * Title: Boxes with heading, text, button.
- * Slug: ash/general-boxes-three-contrast-background
+ * Slug: ash/boxes-three-dark
  * Categories: featured
  */
 ?>
@@ -56,4 +56,4 @@
 	</div>
 	<!-- /wp:columns -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->
diff --git a/patterns/general-boxes-three.php → patterns/boxes-three.php b/patterns/general-boxes-three.php → patterns/boxes-three.php
@@ -2,7 +2,7 @@
 
 /**
  * Title: Boxes with heading, text, button.
- * Slug: ash/general-boxes-three
+ * Slug: ash/boxes-three
  * Categories: featured
  */
 ?>
@@ -56,4 +56,4 @@
 	</div>
 	<!-- /wp:columns -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->
diff --git a/...general-boxes-two-contrast-background.php → patterns/boxes-two-dark.php b/...general-boxes-two-contrast-background.php → patterns/boxes-two-dark.php
@@ -2,7 +2,7 @@
 
 /**
  * Title: Boxes with heading, text, button.
- * Slug: ash/general-boxes-two-contrast-background
+ * Slug: ash/boxes-two-dark
  * Categories: featured
  */
 ?>
@@ -41,4 +41,4 @@
 	</div>
 	<!-- /wp:columns -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->
diff --git a/patterns/general-boxes-two.php → patterns/boxes-two.php b/patterns/general-boxes-two.php → patterns/boxes-two.php
@@ -2,7 +2,7 @@
 
 /**
  * Title: Boxes with heading, text, button.
- * Slug: ash/general-boxes-two
+ * Slug: ash/boxes-two
  * Categories: featured
  */
 ?>
@@ -41,4 +41,4 @@
 	</div>
 	<!-- /wp:columns -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->
diff --git a/patterns/comments.php b/patterns/comments.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Title: Comments section and form
+ * Slug: frost/comments
+ * Inserter: false
+ */
+?>
+<!-- wp:group {"layout":{"type":"constrained"}} -->
+<div class="wp-block-group">
+<!-- wp:comments-query-loop {"className":"site-comments"} -->
+<div class="wp-block-comments-query-loop site-comments">
+<!-- wp:comments-title {"level":3} /-->
+<!-- wp:group {"style":{"spacing":{"margin":{"bottom":"60px"}}}} -->
+<div class="wp-block-group" style="margin-bottom:60px">
+<!-- wp:comment-template -->
+<!-- wp:columns {"style":{"spacing":{"blockGap":"10px","margin":{"bottom":"30px"}}}} -->
+<div class="wp-block-columns" style="margin-bottom:30px">
+<!-- wp:column {"width":"48px"} -->
+<div class="wp-block-column" style="flex-basis:48px">
+<!-- wp:avatar {"size":48,"style":{"border":{"radius":"24px"}}} /-->
+</div>
+<!-- /wp:column -->
+<!-- wp:column {"style":{"spacing":{"blockGap":"10px"}}} -->
+<div class="wp-block-column">
+<!-- wp:comment-author-name /-->
+<!-- wp:group {"style":{"spacing":{"margin":{"top":"0px","bottom":"0px"},"blockGap":"10px"}},"layout":{"type":"flex"}} -->
+<div class="wp-block-group" style="margin-top:0px;margin-bottom:0px">
+<!-- wp:comment-date /-->
+<!-- wp:comment-edit-link /-->
+</div>
+<!-- /wp:group -->
+<!-- wp:comment-content /-->
+<!-- wp:comment-reply-link /-->
+</div>
+<!-- /wp:column -->
+</div>
+<!-- /wp:columns -->
+<!-- /wp:comment-template -->
+</div>
+<!-- /wp:group -->
+<!-- wp:comments-pagination -->
+<!-- wp:comments-pagination-previous /-->
+<!-- wp:comments-pagination-numbers /-->
+<!-- wp:comments-pagination-next /-->
+<!-- /wp:comments-pagination -->
+<!-- wp:post-comments-form /-->
+</div>
+<!-- /wp:comments-query-loop -->
+</div>
+<!-- /wp:group -->
diff --git a/...eneral-cta-button-contrast-background.php → patterns/cta-button-dark.php b/...eneral-cta-button-contrast-background.php → patterns/cta-button-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Call-to-action with text, button.
- * Slug: ash/general-cta-button-contrast-background
+ * Slug: ash/cta-button-dark
  * Categories: call-to-action
  */
 ?>

diff --git a/patterns/general-cta-button.php → patterns/cta-button.php b/patterns/general-cta-button.php → patterns/cta-button.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Call-to-action with text, button.
- * Slug: ash/general-cta-button
+ * Slug: ash/cta-button
  * Categories: call-to-action
  */
 ?>

diff --git a/...neral-cta-stacked-contrast-background.php → patterns/cta-stacked-dark.php b/...neral-cta-stacked-contrast-background.php → patterns/cta-stacked-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Call-to-action with text, button.
- * Slug: ash/general-cta-stacked-contrast-background
+ * Slug: ash/general-cta-stacked-dark
  * Categories: call-to-action
  */
 ?>

diff --git a/patterns/general-cta-stacked.php → patterns/cta-stacked.php b/patterns/general-cta-stacked.php → patterns/cta-stacked.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Call-to-action with text, button.
- * Slug: ash/general-cta-stacked
+ * Slug: ash/cta-stacked
  * Categories: call-to-action
  */
 ?>

diff --git a/...ns/footer-default-contrast-background.php → patterns/footer-default-dark.php b/...ns/footer-default-contrast-background.php → patterns/footer-default-dark.php
@@ -1,15 +1,15 @@
 <?php
 /**
  * Title: Footer with text, links.
- * Slug: ash/footer-default-contrast-background
+ * Slug: ash/footer-default-dark
  * Categories: footer
  * Block Types: core/template-part/footer
  */
 ?>
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|small","bottom":"var:preset|spacing|small"},"margin":{"top":"0px"}},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"backgroundColor":"contrast","textColor":"base","className":"has-background-color","layout":{"type":"constrained"},"fontSize":"small"} -->
 <div class="wp-block-group alignfull has-background-color has-base-color has-contrast-background-color has-text-color has-background has-link-color has-small-font-size" style="margin-top:0px;padding-top:var(--wp--preset--spacing--small);padding-bottom:var(--wp--preset--spacing--small)"><!-- wp:group {"align":"wide","layout":{"type":"flex","allowOrientation":false,"justifyContent":"space-between"}} -->
 <div class="wp-block-group alignwide"><!-- wp:paragraph -->
-<p>© <?php echo esc_html( gmdate( 'Y' ) ); ?> Your Company LLC · <a href="#">Contact Us</a></p>
+<p>&copy; <?php echo esc_html( gmdate( 'Y' ) ); ?> Your Company LLC · <a href="#">Contact Us</a></p>
 <!-- /wp:paragraph -->
 <!-- wp:paragraph -->
 <p><a href="#">Facebook</a> · <a href="#">Twitter</a> · <a href="#">Instagram</a></p>

diff --git a/patterns/footer-mega-contrast-background.php → patterns/footer-mega-dark.php b/patterns/footer-mega-contrast-background.php → patterns/footer-mega-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Footer with text, button, links.
- * Slug: ash/footer-mega-contrast-background
+ * Slug: ash/footer-mega-dark
  * Categories: footer
  * Block Types: core/template-part/footer
  */

diff --git a/...ns/footer-stacked-contrast-background.php → patterns/footer-stacked-dark.php b/...ns/footer-stacked-contrast-background.php → patterns/footer-stacked-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Footer with heading, text, button.
- * Slug: ash/footer-stacked-contrast-background
+ * Slug: ash/footer-stacked-dark
  * Categories: footer
  * Block Types: core/template-part/footer
  */
@@ -19,6 +19,6 @@
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
-<p class="has-text-align-center has-small-font-size">© <?php echo esc_html( gmdate( 'Y' ) ); ?> Your Company LLC · <a href="#"><?php echo esc_html__( 'Contact Us', 'ash' ); ?></a></p>
+<p class="has-text-align-center has-small-font-size">&copy; <?php echo esc_html( gmdate( 'Y' ) ); ?> <?php echo esc_html( get_bloginfo( 'site_title' ) ); ?> · <a href="#"><?php echo esc_html__( 'Contact Us', 'ash' ); ?></a></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:group -->
diff --git a/patterns/footer-stacked.php b/patterns/footer-stacked.php
@@ -19,6 +19,6 @@
 <!-- /wp:button --></div>
 <!-- /wp:buttons -->
 <!-- wp:paragraph {"align":"center","fontSize":"small"} -->
-<p class="has-text-align-center has-small-font-size">© 2023 Your Company LLC · <a href="#"><?php echo esc_html__( 'Contact Us', 'ash' ); ?></a></p>
+<p class="has-text-align-center has-small-font-size">&copy; <?php echo esc_html( gmdate( 'Y' ) ); ?> <?php echo esc_html( get_bloginfo( 'site_title' ) ); ?> · <a href="#"><?php echo esc_html__( 'Contact Us', 'ash' ); ?></a></p>
 <!-- /wp:paragraph --></div>
 <!-- /wp:group -->
diff --git a/...ter-three-columns-contrast-background.php → patterns/footer-three-columns-dark.php b/...ter-three-columns-contrast-background.php → patterns/footer-three-columns-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Footer with text, links, buttons.
- * Slug: ash/footer-three-columns-contrast-background
+ * Slug: ash/footer-three-columns-dark
  * Categories: footer
  * Block Types: core/template-part/footer
  * Viewport Width: 1280
@@ -12,7 +12,7 @@
 <!-- wp:group {"align":"wide","layout":{"type":"flex","allowOrientation":false,"justifyContent":"space-between"}} -->
 <div class="wp-block-group alignwide">
 <!-- wp:paragraph -->
-<p>© <?php echo esc_html( gmdate( 'Y' ) ); ?> Your Company LLC</p>
+<p>&copy; <?php echo esc_html( gmdate( 'Y' ) ); ?> Your Company LLC</p>
 <!-- /wp:paragraph -->
 <!-- wp:paragraph -->
 <p><a href="#"><?php echo esc_html__( 'Privacy Policy', 'ash' ); ?></a> · <a href="#"><?php echo esc_html__( 'Terms of Service', 'ash' ); ?></a> · <a href="#"><?php echo esc_html__( 'Contact Us', 'ash' ); ?></a></p>

diff --git a/patterns/footer-three-columns.php b/patterns/footer-three-columns.php
@@ -9,7 +9,7 @@
 <!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"var:preset|spacing|small","bottom":"var:preset|spacing|small"},"margin":{"top":"0px"}}},"layout":{"type":"constrained"},"fontSize":"small"} -->
 <div class="wp-block-group alignfull has-small-font-size" style="margin-top:0px;padding-top:var(--wp--preset--spacing--small);padding-bottom:var(--wp--preset--spacing--small)"><!-- wp:group {"align":"wide","layout":{"type":"flex","allowOrientation":false,"justifyContent":"space-between"}} -->
 <div class="wp-block-group alignwide"><!-- wp:paragraph -->
-<p>© <?php echo esc_html( gmdate( 'Y' ) ); ?> Your Company LLC</p>
+<p>&copy; <?php echo esc_html( gmdate( 'Y' ) ); ?> Your Company LLC</p>
 <!-- /wp:paragraph -->
 <!-- wp:paragraph -->
 <p><a href="#"><?php echo esc_html__( 'Privacy Policy', 'ash' ); ?></a> · <a href="#"><?php echo esc_html__( 'Terms of Service', 'ash' ); ?></a> · <a href="#"><?php echo esc_html__( 'Contact Us', 'ash' ); ?></a></p>

diff --git a/...ns/header-default-contrast-background.php → patterns/header-default-dark.php b/...ns/header-default-contrast-background.php → patterns/header-default-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Header with site title, navigation.
- * Slug: ash/header-default-contrast-background
+ * Slug: ash/header-default-dark
  * Categories: header
  * Block Types: core/template-part/header
  */

diff --git a/...-notification-bar-contrast-background.php → patterns/header-notification-bar-dark.php b/...-notification-bar-contrast-background.php → patterns/header-notification-bar-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Header notification bar with text, button.
- * Slug: frost/header-notification-bar-contrast-background
+ * Slug: frost/header-notification-bar-dark
  * Categories: header
  * Block Types: core/template-part/header
  */

diff --git a/patterns/general-hero-one-column.php → patterns/hero-one-column.php b/patterns/general-hero-one-column.php → patterns/hero-one-column.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Section with image, text, buttons.
- * Slug: ash/general-hero-one-column
+ * Slug: ash/hero-one-column
  * Categories: featured
  */
 ?>

diff --git a/patterns/general-hero-two-columns.php → patterns/hero-two-columns.php b/patterns/general-hero-two-columns.php → patterns/hero-two-columns.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Section with image, text, buttons.
- * Slug: ash/general-hero-two-columns
+ * Slug: ash/hero-two-columns
  * Categories: featured
  */
 ?>

diff --git a/...newsletter-signup-contrast-background.php → patterns/newsletter-signup-dark.php b/...newsletter-signup-contrast-background.php → patterns/newsletter-signup-dark.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Box with heading, text.
- * Slug: frost/general-newsletter-signup-contrast-background
+ * Slug: frost/newsletter-signup-dark
  * Categories: call-to-action
  */
 ?>

diff --git a/patterns/general-newsletter-signup.php → patterns/newsletter-signup.php b/patterns/general-newsletter-signup.php → patterns/newsletter-signup.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Box with heading, text.
- * Slug: frost/general-newsletter-signup
+ * Slug: frost/newsletter-signup
  * Categories: call-to-action
  */
 ?>

diff --git a/patterns/general-portfolio.php → patterns/portfolio.php b/patterns/general-portfolio.php → patterns/portfolio.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Title: Portfolio with heading, text, images.
- * Slug: ash/general-portfolio
+ * Slug: ash/portfolio
  * Categories: portfolio
  */
 ?>

diff --git a/...cing-four-columns-contrast-background.php → patterns/pricing-four-columns-dark.php b/...cing-four-columns-contrast-background.php → patterns/pricing-four-columns-dark.php
@@ -2,7 +2,7 @@
 
 /**
  * Title: Pricing table with heading, list, buttons.
- * Slug: ash/general-pricing-four-columns-contrast-background
+ * Slug: ash/pricing-four-columns-dark
  * Categories: pricing
  */
 ?>
@@ -215,4 +215,4 @@
 	</div>
 	<!-- /wp:columns -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->
diff --git a/patterns/general-pricing-four-columns.php → patterns/pricing-four-columns.php b/patterns/general-pricing-four-columns.php → patterns/pricing-four-columns.php
@@ -2,7 +2,7 @@
 
 /**
  * Title: Pricing table with heading, list, buttons.
- * Slug: ash/general-pricing-four-columns
+ * Slug: ash/pricing-four-columns
  * Categories: pricing
  */
 ?>
@@ -215,4 +215,4 @@
 	</div>
 	<!-- /wp:columns -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->