diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a3940ff..084d1025 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,23 +16,21 @@ commands: description: "Set commonly used environment variables" steps: - run: - name: "Set Theme Slug" - command: | - echo "export THEME_SLUG=$(grep 'textdomain":' /tmp/theme/package.json | awk -F: '{print $2}' | sed -e 's/\s//g' -e 's/[\"\,]//g')" >> ${BASH_ENV} - - run: - name: "Set Theme Version" + name: "Set Theme Variables" command: | + echo "export THEME_SLUG=genesis-sample" >> ${BASH_ENV} echo "export THEME_VERSION=$(grep 'version":' /tmp/theme/package.json | awk -F: '{print $2}' | sed -e 's/\s//g' -e 's/[\"\,]//g')" >> ${BASH_ENV} + echo "export THEME_TEXT_DOMAIN=genesis-sample" >> ${BASH_ENV} - run: name: "Set Artifact Name" command: | - echo "export VERSION_ARTIFACT_FILE=${THEME_SLUG}.${THEME_VERSION}.zip" >> ${BASH_ENV} - echo "export VERSION_DATA_FILE=${THEME_SLUG}.${THEME_VERSION}.json" >> ${BASH_ENV} + echo "export VERSION_ARTIFACT_FILE=${THEME_TEXT_DOMAIN}.${THEME_VERSION}.zip" >> ${BASH_ENV} + echo "export VERSION_DATA_FILE=${THEME_TEXT_DOMAIN}.${THEME_VERSION}.json" >> ${BASH_ENV} - run: name: "Set Latest Artifact Name" command: | - echo "export LATEST_ARTIFACT_FILE=${THEME_SLUG}.latest.zip" >> ${BASH_ENV} - echo "export LATEST_DATA_FILE=${THEME_SLUG}.latest.json" >> ${BASH_ENV} + echo "export LATEST_ARTIFACT_FILE=${THEME_TEXT_DOMAIN}.latest.zip" >> ${BASH_ENV} + echo "export LATEST_DATA_FILE=${THEME_TEXT_DOMAIN}.latest.json" >> ${BASH_ENV} executors: base: @@ -136,7 +134,7 @@ jobs: cp /tmp/artifacts/${VERSION_DATA_FILE} /tmp/artifacts/${LATEST_DATA_FILE} - aws-s3/sync: from: "/tmp/artifacts/" - to: "s3://update.atomicblocks.com/<< parameters.environment >>/${THEME_SLUG}/" + to: "s3://update.atomicblocks.com/<< parameters.environment >>/${THEME_TEXT_DOMAIN}/" workflows: version: 2 diff --git a/.scripts/makePIServiceData.js b/.scripts/makePIServiceData.js index feface7c..3e833b1d 100644 --- a/.scripts/makePIServiceData.js +++ b/.scripts/makePIServiceData.js @@ -4,12 +4,12 @@ * * @TODO Maybe convert "tags" value to an array? */ -const fs = require('fs'); +const fs = require("fs"); /** * Run the script */ -const runScript = function() { +const runScript = function () { // Sanitize the destination path const destPath = sanitizeDestPath(process.argv[2]); @@ -17,22 +17,26 @@ const runScript = function() { let data = {}; // Get array of "theme" keys from process.env.npm_package_theme_* - const keys = Object.keys(process.env).filter(key => key.match(/npm_package_theme_.+/)); + const keys = Object.keys(process.env).filter((key) => + key.match(/npm_package_theme_.+/) + ); // Iterate through keys and populate the data object // Note: this isn't using a map because we want the output to be an object, not an array - keys.forEach(envKey => { + keys.forEach((envKey) => { key = envKey.match(/npm_package_theme_(.+)/)[1]; // strip npm_package_theme_ from key data[key] = process.env[envKey]; // Save to data object }); // Write data object to a JSON file - const themeName = process.env.THEME_SLUG || data.textdomain; + const themeName = process.env.THEME_TEXT_DOMAIN || data.textdomain; const themeVersion = process.env.THEME_VERSION || data.version; - const fileName = process.env.VERSION_DATA_FILE || `${themeName}.${themeVersion}.json`; + const fileName = + process.env.VERSION_DATA_FILE || `${themeName}.${themeVersion}.json`; const filePath = `${destPath}/${fileName}`; + fs.writeFileSync(filePath, JSON.stringify(data)); -} +}; /** * Sanitize destination path @@ -41,11 +45,11 @@ const runScript = function() { * * @return {string} */ -const sanitizeDestPath = function(path) { +const sanitizeDestPath = function (path) { const defaultPath = process.cwd(); // Return default if a path wasn't provided - if( ! path || ! path.length){ + if (!path || !path.length) { return defaultPath; } @@ -55,7 +59,7 @@ const sanitizeDestPath = function(path) { } return path; -} +}; // Run the script runScript(); diff --git a/CHANGELOG.md b/CHANGELOG.md index 55df0f38..f39ef612 100644 --- 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 index 840add8c..42134b7b 100644 --- a/config/import/content/about.php +++ b/config/import/content/about.php @@ -20,9 +20,9 @@
- -
- + +
+
diff --git a/config/import/content/home-black-white.php b/config/import/content/home-black-white.php index 0338e895..11648b8a 100644 --- a/config/import/content/home-black-white.php +++ b/config/import/content/home-black-white.php @@ -33,93 +33,93 @@
- -
-

Ready to take your next step?

Grow your audience and build a profitable online business.

Get Started Today
-
- + +
+

Ready to take your next step?

Grow your audience and build a profitable online business.

Get Started Today
+
+ - -
- + +
+

What people are saying

- -
- - - -
-
-

Your course helped me to grow my email list from 500 to over 10,000 subscribers—all within 3 months!

Jane

Food Blogger
-
- - - -
-

I started using your email marketing technique and it helped me to make $5,000 more a month without any extra work!

Rob

Copywriter
-
- - - -
-

I was skeptical but I found that your system had multiplied my revenue by 40% after just the first quarter!

Susan

Entrepreneur
-
-
- - - -
- - - -
-
+ +
+ + + +
+
+

Your course helped me to grow my email list from 500 to over 10,000 subscribers—all within 3 months!

Jane

Food Blogger
+
+ + + +
+

I started using your email marketing technique and it helped me to make $5,000 more a month without any extra work!

Rob

Copywriter
+
+ + + +
+

I was skeptical but I found that your system had multiplied my revenue by 40% after just the first quarter!

Susan

Entrepreneur
+
+
+ + + +
+ + + +
+

Contact us today

- + - -
+ +
Get in touch
-
- +
+ - -
- + +
+ - -
-
-
Can I phone or email you?
+ +
+
+
Can I phone or email you?

You can reach us on our contact page or by calling us at 1.123.456.7891

- + - -
How long have you been in business?
+ +
How long have you been in business?

Our team has a combined experience of over 60 years.

- + - -
What is your return policy?
+ +
What is your return policy?

We offer a 30-day return policy for all unused items. For more information, please view our terms of service.

-
- +
+ - -
+ +
Photo by Haley Powers on Unsplash
-
- +
+ CONTENT; diff --git a/config/import/content/home-color.php b/config/import/content/home-color.php index 1050eafe..43036803 100644 --- a/config/import/content/home-color.php +++ b/config/import/content/home-color.php @@ -33,93 +33,93 @@
- -
-

Ready to take your next step?

Grow your audience and build a profitable online business.

Get Started Today
-
- + +
+

Ready to take your next step?

Grow your audience and build a profitable online business.

Get Started Today
+
+ - -
- + +
+

What people are saying

- -
- - - -
-
-

Your course helped me to grow my email list from 500 to over 10,000 subscribers—all within 3 months!

Jane

Food Blogger
-
- - - -
-

I started using your email marketing technique and it helped me to make $5,000 more a month without any extra work!

Rob

Copywriter
-
- - - -
-

I was skeptical but I found that your system had multiplied my revenue by 40% after just the first quarter!

Susan

Entrepreneur
-
-
- - - -
- - - -
-
+ +
+ + + +
+
+

Your course helped me to grow my email list from 500 to over 10,000 subscribers—all within 3 months!

Jane

Food Blogger
+
+ + + +
+

I started using your email marketing technique and it helped me to make $5,000 more a month without any extra work!

Rob

Copywriter
+
+ + + +
+

I was skeptical but I found that your system had multiplied my revenue by 40% after just the first quarter!

Susan

Entrepreneur
+
+
+ + + +
+ + + +
+

Contact us today

- + - -
+ +
Get in touch
-
- +
+ - -
- + +
+ - -
-
-
Can I phone or email you?
+ +
+
+
Can I phone or email you?

You can reach us on our contact page or by calling us at 1.123.456.7891

- + - -
How long have you been in business?
+ +
How long have you been in business?

Our team has a combined experience of over 60 years.

- + - -
What is your return policy?
+ +
What is your return policy?

We offer a 30-day return policy for all unused items. For more information, please view our terms of service.

-
- +
+ - -
+ +
-
- +
+ CONTENT; diff --git a/config/onboarding-shared.php b/config/onboarding-shared.php index 3cbf9465..1dd16764 100644 --- 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 index be1c7cd5..a1cc43e9 100644 --- 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 index 0e3f4fe1..f821a3da 100644 --- 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 index db6bd3b4..926f4320 100644 --- 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 = <<