Merge pull request #354 from studiopress/BMO/GF-2185-ab-to-gb

Update/genesis blocks
studiopress · Oct 19, 2020 · 1288938 · 1288938
2 parents 228b824 + 6546bc6
commit 1288938
Show file tree

Hide file tree

Showing 11 changed files with 150 additions and 144 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Genesis Sample Theme Changelog
 
+## [3.4.0] - 2020-10-20
+Genesis Sample 3.4.0 requires the Genesis Blocks plugin.
+
+* Changed: Install Genesis Blocks instead of Atomic Blocks during one-click theme setup.
+* Changed: Updated one-click-theme-setup content to use Genesis Blocks.
+* Changed: Updated Editor and front-end styles for Genesis Blocks compatibility.
+
 ## [3.3.1] - 2020-08-17
 
 ### Added

diff --git a/config/import/content/about.php b/config/import/content/about.php
@@ -20,9 +20,9 @@
 <div class="wp-block-image"><figure class="aligncenter"><img src="$genesis_sample_about_image_url" alt="" class="wp-image-2141"/></figure></div>
 <!-- /wp:image -->
 
-<!-- wp:atomic-blocks/ab-spacer {"spacerHeight":29} -->
-<div style="color:#ddd" class="wp-block-atomic-blocks-ab-spacer ab-block-spacer ab-divider-solid ab-divider-size-1"><hr style="height:29px"/></div>
-<!-- /wp:atomic-blocks/ab-spacer -->
+<!-- wp:genesis-blocks/gb-spacer {"spacerHeight":29} -->
+<div style="color:#ddd" class="wp-block-genesis-blocks-gb-spacer gb-block-spacer gb-divider-solid gb-divider-size-1"><hr style="height:29px"/></div>
+<!-- /wp:genesis-blocks/gb-spacer -->
 
 <!-- wp:columns -->
 <div class="wp-block-columns has-2-columns"><!-- wp:column -->

diff --git a/config/import/content/home-black-white.php b/config/import/content/home-black-white.php
diff --git a/config/import/content/home-color.php b/config/import/content/home-color.php
diff --git a/config/onboarding-shared.php b/config/onboarding-shared.php
@@ -16,9 +16,9 @@
 return [
 	'plugins'          => [
 		[
-			'name'       => __( 'Atomic Blocks', 'genesis-sample' ),
-			'slug'       => 'atomic-blocks/atomicblocks.php',
-			'public_url' => 'https://atomicblocks.com/',
+			'name'       => __( 'Genesis Blocks', 'genesis-sample' ),
+			'slug'       => 'genesis-blocks/genesis-blocks.php',
+			'public_url' => 'https://wordpress.org/plugins/genesis-blocks/',
 		],
 		[
 			'name'       => __( 'Simple Social Icons', 'genesis-sample' ),

diff --git a/languages/genesis-sample.pot b/languages/genesis-sample.pot
@@ -52,7 +52,7 @@ msgid "by"
 msgstr ""
 
 #: config/onboarding-shared.php:19
-msgid "Atomic Blocks"
+msgid "Genesis Blocks"
 msgstr ""
 
 #: config/onboarding-shared.php:24

diff --git a/lib/gutenberg/front-end.css b/lib/gutenberg/front-end.css
@@ -131,7 +131,7 @@
 /* Buttons
 ---------------------------------------------------------------------------- */
 
-.ab-block-cta .ab-button {
+.gb-block-cta .gb-button {
 	font-family: "Source Sans Pro", sans-serif;
 	font-weight: 600;
 }
@@ -293,21 +293,21 @@
 	padding: 0 30px;
 }
 
-/* Atomic Blocks
+/* Genesis Blocks
 ---------------------------------------------------------------------------- */
 
-.ab-block-post-grid h2 a {
+.gb-block-post-grid h2 a {
 	text-decoration: none;
 }
 
 @media only screen and (max-width: 510px) {
 
-	.ab-block-container.alignfull::before {
+	.gb-block-container.alignfull::before {
 		content: " ";
 		display: table;
 	}
 
-	.ab-block-container.alignfull::after {
+	.gb-block-container.alignfull::after {
 		clear: both;
 		content: " ";
 		display: table;

diff --git a/lib/gutenberg/inline-styles.php b/lib/gutenberg/inline-styles.php
@@ -19,7 +19,7 @@ function genesis_sample_custom_gutenberg_css() {
 	$appearance = genesis_get_config( 'appearance' );
 
 	$css = <<<CSS
-.ab-block-post-grid .ab-post-grid-items h2 a:hover {
+.gb-block-post-grid .gb-post-grid-items h2 a:hover {
 	color: {$appearance['link-color']};
 }
 
@@ -64,7 +64,7 @@ function genesis_sample_custom_gutenberg_admin_css() {
 	$appearance = genesis_get_config( 'appearance' );
 
 	$css = <<<CSS
-.ab-block-post-grid .ab-post-grid-items h2 a:hover,
+.gb-block-post-grid .gb-post-grid-items h2 a:hover,
 .block-editor__container .editor-styles-wrapper a {
 	color: {$appearance['link-color']};
 }

diff --git a/lib/gutenberg/style-editor.css b/lib/gutenberg/style-editor.css
@@ -201,7 +201,6 @@ p.has-background.light-text a:hover {
 	background-color: #333;
 }
 
-
 .wp-block-pullquote.is-style-solid-color.alignleft blockquote,
 .wp-block-pullquote.is-style-solid-color.alignright blockquote {
 	max-width: 80%;
@@ -338,7 +337,7 @@ table {
 /* Buttons
 ---------------------------------------------------------------------------- */
 
-.ab-block-cta .ab-button {
+.gb-block-cta .gb-button {
 	font-family: "Source Sans Pro", sans-serif;
 	font-weight: 600;
 }

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
 		"description": "The sample child theme for the Genesis Framework.",
 		"author": "StudioPress",
 		"authoruri": "https://www.studiopress.com/",
-		"version": "3.3.1",
+		"version": "3.4.0",
 		"tags": "one-column, two-columns, left-sidebar, right-sidebar, accessibility-ready, custom-colors, custom-logo, custom-menu, featured-images, footer-widgets, full-width-template, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready",
 		"license": "GPL-2.0-or-later",
 		"licenseuri": "https://www.gnu.org/licenses/gpl-2.0.html",

diff --git a/style.css b/style.css
@@ -5,7 +5,7 @@ Description: This is the sample theme created for the Genesis Framework.
 Author: StudioPress
 Author URI: https://www.studiopress.com/
 
-Version: 3.3.1
+Version: 3.4.0
 
 Tags: accessibility-ready, block-styles, custom-colors, custom-logo, custom-menu, editor-style, featured-images, footer-widgets, full-width-template, left-sidebar, one-column, right-sidebar, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, two-columns, wide-blocks