Replace Meraki with Meraki 2

meraki-2/patterns/home.php

@@ -0,0 +1,133 @@
+<?php
+/**
+ * Title: Home Pattern
+ * slug: meraki/home
+ * inserter: no
+ */
+?>
+
+<!-- wp:group {"align":"full","style":{"spacing":{"blockGap":{"top":"0px","left":"0px"}}}} -->
+<div class="wp-block-group alignfull"><!-- wp:group {"align":"full","style":{"spacing":{"margin":{"top":"0px","bottom":"0px"}},"border":{"width":"0px","style":"none"}},"textColor":"black","layout":{"inherit":true},"fontSize":"14px"} -->
+<div class="wp-block-group alignfull has-black-color has-text-color has-14-px-font-size" style="border-style:none;border-width:0;margin-top:0;margin-bottom:0;"><!-- wp:query {"queryId":35,"query":{"perPage":"1","pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"},"align":"full"} -->
+<div class="wp-block-query alignfull"><!-- wp:post-template {"align":"center"} -->
+<!-- wp:cover {"useFeaturedImage":true,"dimRatio":20,"overlayColor":"foreground","minHeight":50,"minHeightUnit":"vw","align":"full"} -->
+<div class="wp-block-cover alignfull" style="min-height:50vw;"><span aria-hidden="true" class="wp-block-cover__background has-foreground-background-color has-background-dim-20 has-background-dim"></span><div class="wp-block-cover__inner-container"><!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff"}}} -->
+<div class="wp-block-group alignfull has-text-color" style="color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px;"><!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"textTransform":"uppercase","fontSize":"14px","letterSpacing":"1px"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}}} /-->
+
+<!-- wp:post-title {"textAlign":"center","isLink":true,"style":{"typography":{"fontStyle":"normal","fontWeight":"600"},"elements":{"link":{"color":{"text":"var:preset|color|background"}}}},"fontSize":"huge"} /--></div>
+<!-- /wp:group --></div></div>
+<!-- /wp:cover -->
+<!-- /wp:post-template --></div>
+<!-- /wp:query --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"color":{"background":"#fbf6f9"},"spacing":{"padding":{"top":"80px","bottom":"80px"}},"border":{"width":"0px","style":"none"}},"textColor":"black","layout":{"inherit":true},"fontSize":"14px"} -->
+<div class="wp-block-group alignfull has-black-color has-text-color has-background has-14-px-font-size" style="background-color:#fbf6f9;border-style:none;border-width:0;padding-top:80px;padding-bottom:80px;"><!-- wp:group {"align":"wide","layout":{"contentSize":"785px"}} -->
+<div class="wp-block-group alignwide"><!-- wp:heading {"textAlign":"center","fontSize":"large"} -->
+<h2 class="has-text-align-center has-large-font-size">Hello, I'm Veronica</h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph {"align":"center","style":{"typography":{"fontSize":"20px"}}} -->
+<p class="has-text-align-center" style="font-size:20px;">The sky is not completely dark at night. Were the sky absolutely dark, one would not be able to see the silhouette of an object against the sky.</p>
+<!-- /wp:paragraph --></div>
+<!-- /wp:group -->
+
+<!-- wp:spacer {"height":"20px"} -->
+<div style="height:20px;" aria-hidden="true" class="wp-block-spacer"></div>
+<!-- /wp:spacer -->
+
+<!-- wp:columns {"align":"wide"} -->
+<div class="wp-block-columns alignwide"><!-- wp:column -->
+<div class="wp-block-column"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/ibrahim-rifath-y6tbl0pte-g-unsplash.jpg'; ?>","id":11,"dimRatio":20,"customOverlayColor":"#ffc6c6","minHeight":250,"contentPosition":"bottom center","isDark":false} -->
+<div class="wp-block-cover is-light has-custom-content-position is-position-bottom-center" style="min-height:250px;"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-20 has-background-dim" style="background-color:#ffc6c6;"></span><img class="wp-block-cover__image-background wp-image-11" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/ibrahim-rifath-y6tbl0pte-g-unsplash.jpg'; ?>" data-object-fit="cover" /><div class="wp-block-cover__inner-container"><!-- wp:heading {"textAlign":"center","style":{"typography":{"fontSize":"18px","fontStyle":"normal","fontWeight":"400"},"color":{"background":"#ffffffc7"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}}}} -->
+<h2 class="has-text-align-center has-background has-link-color" style="background-color:#ffffffc7;font-size:18px;font-style:normal;font-weight:400;"><a href="#">About Me</a></h2>
+<!-- /wp:heading --></div></div>
+<!-- /wp:cover --></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/pexels-leah-kelley-3935702.jpg'; ?>","id":12,"dimRatio":20,"customOverlayColor":"#ffc6c6","minHeight":250,"contentPosition":"bottom center","isDark":false} -->
+<div class="wp-block-cover is-light has-custom-content-position is-position-bottom-center" style="min-height:250px;"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-20 has-background-dim" style="background-color:#ffc6c6;"></span><img class="wp-block-cover__image-background wp-image-12" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/pexels-leah-kelley-3935702.jpg'; ?>" data-object-fit="cover" /><div class="wp-block-cover__inner-container"><!-- wp:heading {"textAlign":"center","style":{"typography":{"fontSize":"18px","fontStyle":"normal","fontWeight":"400"},"color":{"background":"#ffffffc7"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}}},"textColor":"foreground"} -->
+<h2 class="has-text-align-center has-foreground-color has-text-color has-background has-link-color" style="background-color:#ffffffc7;font-size:18px;font-style:normal;font-weight:400;"><a href="#">Destination Guides</a></h2>
+<!-- /wp:heading --></div></div>
+<!-- /wp:cover --></div>
+<!-- /wp:column -->
+
+<!-- wp:column -->
+<div class="wp-block-column"><!-- wp:cover {"url":"<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/sarandy-westfall-qqd8aphaog4-unsplash.jpg'; ?>","id":13,"dimRatio":20,"customOverlayColor":"#ffc6c6","minHeight":250,"contentPosition":"bottom center","isDark":false} -->
+<div class="wp-block-cover is-light has-custom-content-position is-position-bottom-center" style="min-height:250px;"><span aria-hidden="true" class="wp-block-cover__background has-background-dim-20 has-background-dim" style="background-color:#ffc6c6;"></span><img class="wp-block-cover__image-background wp-image-13" alt="" src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/sarandy-westfall-qqd8aphaog4-unsplash.jpg'; ?>" data-object-fit="cover" /><div class="wp-block-cover__inner-container"><!-- wp:heading {"textAlign":"center","style":{"typography":{"fontSize":"18px","fontStyle":"normal","fontWeight":"400"},"color":{"background":"#ffffffc7"},"elements":{"link":{"color":{"text":"var:preset|color|black"}}}}} -->
+<h2 class="has-text-align-center has-background has-link-color" style="background-color:#ffffffc7;font-size:18px;font-style:normal;font-weight:400;"><a href="#">Instagram</a></h2>
+<!-- /wp:heading --></div></div>
+<!-- /wp:cover --></div>
+<!-- /wp:column --></div>
+<!-- /wp:columns --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"80px","bottom":"80px","left":"0px"}}},"borderColor":"background","textColor":"black","layout":{"inherit":true},"fontSize":"14px"} -->
+<div class="wp-block-group alignwide has-border-color has-background-border-color has-black-color has-text-color has-14-px-font-size" style="padding-top:80px;padding-bottom:80px;padding-left:0;"><!-- wp:query {"queryId":11,"query":{"perPage":"5","pages":0,"offset":"1","postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false},"displayLayout":{"type":"list","columns":3},"align":"wide","layout":{"inherit":false}} -->
+<div class="wp-block-query alignwide"><!-- wp:post-template -->
+<!-- wp:group {"align":"wide","style":{"spacing":{"padding":{"top":"60px","bottom":"60px"}}}} -->
+<div class="wp-block-group alignwide" style="padding-top:60px;padding-bottom:60px;"><!-- wp:post-terms {"term":"category","textAlign":"center","style":{"typography":{"textTransform":"uppercase","letterSpacing":"1px","fontSize":"14px","fontStyle":"normal","fontWeight":"600"},"elements":{"link":{"color":{"text":"var:preset|color|primary"}}}}} /-->
+
+<!-- wp:post-title {"textAlign":"center","isLink":true,"style":{"elements":{"link":{"color":{"text":"#1a2530"}}}},"fontSize":"large"} /-->
+
+<!-- wp:post-featured-image {"width":"","align":"center"} /-->
+
+<!-- wp:post-content {"layout":{"inherit":true}} /--></div>
+<!-- /wp:group -->
+
+<!-- wp:separator {"align":"center","backgroundColor":"tertiary","className":"is-style-wide"} -->
+<hr class="wp-block-separator aligncenter has-text-color has-tertiary-color has-alpha-channel-opacity has-tertiary-background-color has-background is-style-wide" />
+<!-- /wp:separator -->
+<!-- /wp:post-template -->
+
+<!-- wp:query-pagination {"paginationArrow":"arrow","layout":{"type":"flex","justifyContent":"space-between"}} -->
+<!-- wp:query-pagination-previous /-->
+
+<!-- wp:query-pagination-next /-->
+<!-- /wp:query-pagination --></div>
+<!-- /wp:query --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"color":{"background":"#fbf6f9"},"spacing":{"padding":{"top":"80px","bottom":"80px"}},"border":{"width":"0px","style":"none"}},"textColor":"black","layout":{"inherit":true},"fontSize":"14px"} -->
+<div class="wp-block-group alignfull has-black-color has-text-color has-background has-14-px-font-size" style="background-color:#fbf6f9;border-style:none;border-width:0;padding-top:80px;padding-bottom:80px;"><!-- wp:media-text {"mediaId":11,"mediaLink":"<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/ibrahim-rifath-y6tbl0pte-g-unsplash.jpg'; ?>","mediaType":"image","imageFill":true,"backgroundColor":"background"} -->
+<div class="wp-block-media-text alignwide is-stacked-on-mobile is-image-fill has-background-background-color has-background"><figure class="wp-block-media-text__media" style="background-image:url('<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/ibrahim-rifath-y6tbl0pte-g-unsplash.jpg'; ?>');background-position:50% 50%;"><img src="<?php echo esc_url( get_stylesheet_directory_uri() ) . '/assets/images/ibrahim-rifath-y6tbl0pte-g-unsplash.jpg'; ?>" alt="" class="wp-image-11 size-full" /></figure><div class="wp-block-media-text__content"><!-- wp:group {"style":{"spacing":{"padding":{"top":"40px","bottom":"40px"}}}} -->
+<div class="wp-block-group" style="padding-top:40px;padding-bottom:40px;"><!-- wp:heading {"style":{"typography":{"fontSize":"32px"}}} -->
+<h2 style="font-size:32px;">About Me</h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph {"style":{"typography":{"fontSize":"16px"},"color":{"text":"#505050"}}} -->
+<p class="has-text-color" style="color:#505050;font-size:16px;">The sky is not completely dark at night. Were the sky absolutely dark, one would not be able to see the silhouette of an object against the sky.</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:heading {"level":4} -->
+<h4>Follow Me On</h4>
+<!-- /wp:heading -->
+
+<!-- wp:social-links {"size":"has-small-icon-size","className":"is-style-logos-only","style":{"spacing":{"blockGap":{"top":"16px","left":"16px"}}}} -->
+<ul class="wp-block-social-links has-small-icon-size is-style-logos-only"><!-- wp:social-link {"url":"#","service":"facebook"} /-->
+
+<!-- wp:social-link {"url":"#","service":"twitter"} /-->
+
+<!-- wp:social-link {"url":"#","service":"instagram"} /-->
+
+<!-- wp:social-link {"url":"#","service":"pinterest"} /--></ul>
+<!-- /wp:social-links --></div>
+<!-- /wp:group --></div></div>
+<!-- /wp:media-text --></div>
+<!-- /wp:group -->
+
+<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","bottom":"100px"}},"border":{"width":"0px","style":"none"}},"backgroundColor":"secondary","textColor":"black","layout":{"inherit":true},"fontSize":"14px"} -->
+<div class="wp-block-group alignfull has-black-color has-secondary-background-color has-text-color has-background has-14-px-font-size" style="border-style:none;border-width:0;padding-top:100px;padding-bottom:100px;"><!-- wp:heading {"textAlign":"center","fontSize":"large"} -->
+<h2 class="has-text-align-center has-large-font-size">Subscribe To My Newsletter</h2>
+<!-- /wp:heading -->
+
+<!-- wp:paragraph {"align":"center"} -->
+<p class="has-text-align-center">Subscribe for new travel stories and exclusive content.</p>
+<!-- /wp:paragraph -->
+
+<!-- wp:jetpack/subscriptions {"submitButtonText":"SUBSCRIBE","buttonBackgroundColor":"black","fontSize":"14px","customFontSize":"14px","borderRadius":50,"borderWeight":1,"borderColor":"black","className":"is-style-compact"} -->
+<div class="wp-block-jetpack-subscriptions wp-block-jetpack-subscriptions__supports-newline is-style-compact">[jetpack_subscription_form show_subscribers_total="false" button_on_newline="false" submit_button_text="SUBSCRIBE" custom_font_size="14px" custom_border_radius="50" custom_border_weight="1" custom_padding="15" custom_spacing="10" submit_button_classes="has-14-px-font-size has-black-border-color has-background has-black-background-color" email_field_classes="has-14-px-font-size has-black-border-color" show_only_email_and_button="true" success_message="Success! An email was just sent to confirm your subscription. Please find the email now and click 'Confirm Follow' to start subscribing."]</div>
+<!-- /wp:jetpack/subscriptions --></div>
+<!-- /wp:group --></div>
+<!-- /wp:group -->

meraki/readme.txt → meraki-2/readme.txt

@@ -1,42 +1,15 @@
-=== Meraki ===
+=== Meraki 2 ===
 Contributors: Automattic
 Requires at least: 5.8
-Tested up to: 5.9
+Tested up to: 6.1
 Requires PHP: 5.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
 == Description ==
-Meraki is a blogging theme that supports full-site editing.
+Meraki 2 is a blogging theme that supports full-site editing.
 
-== Changelog ==
-
-= 0.0.9 =
-* Blockbase + children: remove __unstableLocation (#6759)
-
-= 0.0.8 =
-* Removed font families from the child so that Blockbases are used instead (#6405)
-
-= 0.0.7 =
-* lock post-content block by default (#6314)
-
-= 0.0.6 =
-* Blockbase 3 (#6167)
-
-= 0.0.5 =
-* Meraki: Re-add the 'auto-loading-homepage' tag to style.css (#6039)
-
-= 0.0.4 =
-* Meraki: Update footer pattern background color; update footer pattern structure to avoid horizontal scrollbars. (#6030)
-
-= 0.0.3 =
-* Meraki: Style updates. (#5999)
-* Meraki: Update the footer pattern. (#5998)
-
-= 0.0.2 =
-* Meraki: Work in progress (#5862)
-
-= 0.0.1 =
+= 1.0.0 =
 * Initial release
 
 == Copyright ==

meraki/style.css → meraki-2/style.css

@@ -1,16 +1,16 @@
 /*
-Theme Name: Meraki
+Theme Name: Meraki 2
 Theme URI: https://wordpress.com/theme/meraki
 Author: Automattic
 Author URI: https://automattic.com/
 Description: Meraki is a blogging theme that supports full-site editing.
 Requires at least: 5.8
-Tested up to: 5.9
+Tested up to: 6.1
 Requires PHP: 5.7
-Version: 0.0.9
+Version: 1.0.0
 License: GNU General Public License v2 or later
 License URI: https://raw.githubusercontent.com/Automattic/themes/trunk/LICENSE
 Template: blockbase
-Text Domain: meraki
+Text Domain: meraki-2
 Tags: one-column, custom-colors, custom-menu, custom-logo, editor-style, featured-images, full-site-editing, rtl-language-support, theme-options, threaded-comments, translation-ready, wide-blocks, auto-loading-homepage
 */

meraki-2/templates/home.html

@@ -0,0 +1,9 @@
+<!-- wp:template-part {"slug":"header","tagName":"header"} /-->
+
+<!-- wp:group {"tagName":"main"} -->
+<main class="wp-block-group">
+	<!-- wp:pattern {"slug":"meraki/home"} -->
+</main>
+<!-- /wp:group -->
+
+<!-- wp:template-part {"slug":"footer","tagName":"footer","className":"site-footer-container"} /-->