From eb1a2f8e90afc0525baf610308f6ff05d402b6d3 Mon Sep 17 00:00:00 2001 From: BMO Date: Wed, 8 Jul 2020 13:45:50 -0500 Subject: [PATCH 01/11] feat: update from AB to GB --- config/import/content/about.php | 6 +- config/import/content/home-black-white.php | 126 ++++++++++----------- config/import/content/home-color.php | 126 ++++++++++----------- config/onboarding-shared.php | 8 +- languages/genesis-sample.pot | 4 +- lib/gutenberg/front-end.css | 29 ++--- lib/gutenberg/inline-styles.php | 4 +- lib/gutenberg/style-editor.css | 3 +- 8 files changed, 148 insertions(+), 158 deletions(-) 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..87211896 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/genesisblocks.php', + 'public_url' => 'https://wpeng.in/genesis-blocks/', ], [ 'name' => __( 'Simple Social Icons', 'genesis-sample' ), @@ -137,4 +137,4 @@ ], ], ], -]; +]; \ No newline at end of file diff --git a/languages/genesis-sample.pot b/languages/genesis-sample.pot index 62ad97d4..40ee4404 100644 --- a/languages/genesis-sample.pot +++ b/languages/genesis-sample.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Genesis Sample 3.3.0\n" "Report-Msgid-Bugs-To: StudioPress \n" -"POT-Creation-Date: 2020-04-01 20:59:05+00:00\n" +"POT-Creation-Date: 2020-07-08 18:45:29+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -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..78cc9266 100644 --- a/lib/gutenberg/front-end.css +++ b/lib/gutenberg/front-end.css @@ -13,7 +13,9 @@ /* Paragraphs ---------------------------------------------------------------------------- */ -.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) { +.alignfull:not(.has-background) + .wp-block-group__inner-container + > p:not(.has-background-color) { padding-left: 30px; padding-right: 30px; } @@ -101,13 +103,11 @@ } @media only screen and (max-width: 600px) { - .wp-block-button.home-contact, .wp-block-buttons.home-contact { float: left; margin-left: 0; } - } /* Columns @@ -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; } @@ -209,7 +209,8 @@ max-width: 80%; } -.site-container .wp-block-pullquote:not(.is-style-solid-color)[style*="border-color"] { +.site-container + .wp-block-pullquote:not(.is-style-solid-color)[style*="border-color"] { border: 2px solid; border-left: none; border-right: none; @@ -293,26 +294,24 @@ 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; } - } /* Other Blocks @@ -363,7 +362,6 @@ hr.wp-block-separator { } @media only screen and (min-width: 960px) { - .full-width-content .site-container > .wp-block-table.alignwide { width: calc(100% + 360px); } @@ -373,22 +371,18 @@ hr.wp-block-separator { margin-right: calc(-100vw / 2 + 100% / 2); width: 100vw; } - } @media only screen and (max-width: 600px) { - .wp-block-media-text.is-stacked-on-mobile figure { margin-bottom: 20px; } - } /* Media Queries ---------------------------------------------------------------------------- */ @media only screen and (min-width: 960px) { - .full-width-content .entry-content > .alignwide { margin-left: -180px; margin-right: -180px; @@ -401,15 +395,12 @@ hr.wp-block-separator { max-width: 1062px; margin: 0 auto; } - } @media only screen and (max-width: 781px) { - .site-container .wp-block-column { flex-basis: 100%; margin-left: 0; margin-right: 0; } - } 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 = << Date: Fri, 24 Jul 2020 09:22:30 -0500 Subject: [PATCH 02/11] fix: lint error --- config/onboarding-shared.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/onboarding-shared.php b/config/onboarding-shared.php index 87211896..5e592cde 100644 --- a/config/onboarding-shared.php +++ b/config/onboarding-shared.php @@ -137,4 +137,4 @@ ], ], ], -]; \ No newline at end of file +]; From 8a82792b9c6d7148c051f56a0598e4ca2989c6a0 Mon Sep 17 00:00:00 2001 From: BMO Date: Fri, 24 Jul 2020 09:25:37 -0500 Subject: [PATCH 03/11] fix: css and js lint errors --- lib/gutenberg/front-end.css | 11 ++- style.css | 177 +++++++++++++++++++++++++++++++++++- 2 files changed, 184 insertions(+), 4 deletions(-) diff --git a/lib/gutenberg/front-end.css b/lib/gutenberg/front-end.css index 78cc9266..6f0caaaf 100644 --- a/lib/gutenberg/front-end.css +++ b/lib/gutenberg/front-end.css @@ -14,8 +14,7 @@ ---------------------------------------------------------------------------- */ .alignfull:not(.has-background) - .wp-block-group__inner-container - > p:not(.has-background-color) { +.wp-block-group__inner-container > p:not(.has-background-color) { padding-left: 30px; padding-right: 30px; } @@ -103,6 +102,7 @@ } @media only screen and (max-width: 600px) { + .wp-block-button.home-contact, .wp-block-buttons.home-contact { float: left; @@ -210,7 +210,7 @@ } .site-container - .wp-block-pullquote:not(.is-style-solid-color)[style*="border-color"] { +.wp-block-pullquote:not(.is-style-solid-color)[style*="border-color"] { border: 2px solid; border-left: none; border-right: none; @@ -302,6 +302,7 @@ } @media only screen and (max-width: 510px) { + .gb-block-container.alignfull::before { content: " "; display: table; @@ -362,6 +363,7 @@ hr.wp-block-separator { } @media only screen and (min-width: 960px) { + .full-width-content .site-container > .wp-block-table.alignwide { width: calc(100% + 360px); } @@ -374,6 +376,7 @@ hr.wp-block-separator { } @media only screen and (max-width: 600px) { + .wp-block-media-text.is-stacked-on-mobile figure { margin-bottom: 20px; } @@ -383,6 +386,7 @@ hr.wp-block-separator { ---------------------------------------------------------------------------- */ @media only screen and (min-width: 960px) { + .full-width-content .entry-content > .alignwide { margin-left: -180px; margin-right: -180px; @@ -398,6 +402,7 @@ hr.wp-block-separator { } @media only screen and (max-width: 781px) { + .site-container .wp-block-column { flex-basis: 100%; margin-left: 0; diff --git a/style.css b/style.css index 4666bca4..2f03b70d 100755 --- a/style.css +++ b/style.css @@ -86,7 +86,182 @@ Requires PHP: 5.6 /* normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css ---------------------------------------------------------------------------- */ /* stylelint-disable */ -html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}[hidden],template{display:none} +html { + line-height: 1.15; + -webkit-text-size-adjust: 100%; +} + +body { + margin: 0; +} + +main { + display: block; +} + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +hr { + box-sizing: content-box; + height: 0; + overflow: visible; +} + +pre { + font-family: monospace, monospace; + font-size: 1em; +} + +a { + background-color: transparent; +} + +abbr[title] { + border-bottom: none; + text-decoration: underline; + text-decoration: underline dotted; +} + +b, +strong { + font-weight: bolder; +} + +code, +kbd, +samp { + font-family: monospace, monospace; + font-size: 1em; +} + +small { + font-size: 80%; +} + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +img { + border-style: none; +} + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; + font-size: 100%; + line-height: 1.15; + margin: 0; +} + +button, +input { + overflow: visible; +} + +button, +select { + text-transform: none; +} + +[type=button], +[type=reset], +[type=submit], +button { + -webkit-appearance: button; +} + +[type=button]::-moz-focus-inner, +[type=reset]::-moz-focus-inner, +[type=submit]::-moz-focus-inner, +button::-moz-focus-inner { + border-style: none; + padding: 0; +} + +[type=button]:-moz-focusring, +[type=reset]:-moz-focusring, +[type=submit]:-moz-focusring, +button:-moz-focusring { + outline: 1px dotted ButtonText; +} + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +legend { + box-sizing: border-box; + color: inherit; + display: table; + max-width: 100%; + padding: 0; + white-space: normal; +} + +progress { + vertical-align: baseline; +} + +textarea { + overflow: auto; +} + +[type=checkbox], +[type=radio] { + box-sizing: border-box; + padding: 0; +} + +[type=number]::-webkit-inner-spin-button, +[type=number]::-webkit-outer-spin-button { + height: auto; +} + +[type=search] { + -webkit-appearance: textfield; + outline-offset: -2px; +} + +[type=search]::-webkit-search-decoration { + -webkit-appearance: none; +} + +::-webkit-file-upload-button { + -webkit-appearance: button; + font: inherit; +} + +details { + display: block; +} + +summary { + display: list-item; +} + +[hidden], +template { + display: none; +} /* stylelint-enable */ /* Box Sizing From ea53f0d9ad13e5f4ef6f0e5645743cfc7c7c4eec Mon Sep 17 00:00:00 2001 From: BMO Date: Fri, 24 Jul 2020 09:28:36 -0500 Subject: [PATCH 04/11] fix: normalize.css --- style.css | 179 +----------------------------------------------------- 1 file changed, 2 insertions(+), 177 deletions(-) diff --git a/style.css b/style.css index 2f03b70d..a5dc996c 100755 --- a/style.css +++ b/style.css @@ -84,184 +84,9 @@ Requires PHP: 5.6 ---------------------------------------------------------------------------- */ /* normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css ----------------------------------------------------------------------------- */ +--------------------------------------------- */ /* stylelint-disable */ -html { - line-height: 1.15; - -webkit-text-size-adjust: 100%; -} - -body { - margin: 0; -} - -main { - display: block; -} - -h1 { - font-size: 2em; - margin: 0.67em 0; -} - -hr { - box-sizing: content-box; - height: 0; - overflow: visible; -} - -pre { - font-family: monospace, monospace; - font-size: 1em; -} - -a { - background-color: transparent; -} - -abbr[title] { - border-bottom: none; - text-decoration: underline; - text-decoration: underline dotted; -} - -b, -strong { - font-weight: bolder; -} - -code, -kbd, -samp { - font-family: monospace, monospace; - font-size: 1em; -} - -small { - font-size: 80%; -} - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -img { - border-style: none; -} - -button, -input, -optgroup, -select, -textarea { - font-family: inherit; - font-size: 100%; - line-height: 1.15; - margin: 0; -} - -button, -input { - overflow: visible; -} - -button, -select { - text-transform: none; -} - -[type=button], -[type=reset], -[type=submit], -button { - -webkit-appearance: button; -} - -[type=button]::-moz-focus-inner, -[type=reset]::-moz-focus-inner, -[type=submit]::-moz-focus-inner, -button::-moz-focus-inner { - border-style: none; - padding: 0; -} - -[type=button]:-moz-focusring, -[type=reset]:-moz-focusring, -[type=submit]:-moz-focusring, -button:-moz-focusring { - outline: 1px dotted ButtonText; -} - -fieldset { - padding: 0.35em 0.75em 0.625em; -} - -legend { - box-sizing: border-box; - color: inherit; - display: table; - max-width: 100%; - padding: 0; - white-space: normal; -} - -progress { - vertical-align: baseline; -} - -textarea { - overflow: auto; -} - -[type=checkbox], -[type=radio] { - box-sizing: border-box; - padding: 0; -} - -[type=number]::-webkit-inner-spin-button, -[type=number]::-webkit-outer-spin-button { - height: auto; -} - -[type=search] { - -webkit-appearance: textfield; - outline-offset: -2px; -} - -[type=search]::-webkit-search-decoration { - -webkit-appearance: none; -} - -::-webkit-file-upload-button { - -webkit-appearance: button; - font: inherit; -} - -details { - display: block; -} - -summary { - display: list-item; -} - -[hidden], -template { - display: none; -} +html{line-height:1.15;-webkit-text-size-adjust:100%}body{margin:0}main{display:block}h1{font-size:2em;margin:.67em 0}hr{box-sizing:content-box;height:0;overflow:visible}pre{font-family:monospace,monospace;font-size:1em}a{background-color:transparent}abbr[title]{border-bottom:none;text-decoration:underline;text-decoration:underline dotted}b,strong{font-weight:bolder}code,kbd,samp{font-family:monospace,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}img{border-style:none}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:1.15;margin:0}button,input{overflow:visible}button,select{text-transform:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{border-style:none;padding:0}[type=button]:-moz-focusring,[type=reset]:-moz-focusring,[type=submit]:-moz-focusring,button:-moz-focusring{outline:1px dotted ButtonText}fieldset{padding:.35em .75em .625em}legend{box-sizing:border-box;color:inherit;display:table;max-width:100%;padding:0;white-space:normal}progress{vertical-align:baseline}textarea{overflow:auto}[type=checkbox],[type=radio]{box-sizing:border-box;padding:0}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}details{display:block}summary{display:list-item}[hidden],template{display:none} /* stylelint-enable */ /* Box Sizing From f8b90518392ab9e61b08a6ddce044000e1d05eb2 Mon Sep 17 00:00:00 2001 From: BMO Date: Fri, 24 Jul 2020 14:35:06 -0500 Subject: [PATCH 05/11] fix: minor adjustments from PR feedback --- config/onboarding-shared.php | 2 +- lib/gutenberg/front-end.css | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/onboarding-shared.php b/config/onboarding-shared.php index 5e592cde..b8636dfc 100644 --- a/config/onboarding-shared.php +++ b/config/onboarding-shared.php @@ -17,7 +17,7 @@ 'plugins' => [ [ 'name' => __( 'Genesis Blocks', 'genesis-sample' ), - 'slug' => 'genesis-blocks/genesisblocks.php', + 'slug' => 'genesis-blocks/genesis-blocks.php', 'public_url' => 'https://wpeng.in/genesis-blocks/', ], [ diff --git a/lib/gutenberg/front-end.css b/lib/gutenberg/front-end.css index 6f0caaaf..9a1434ed 100644 --- a/lib/gutenberg/front-end.css +++ b/lib/gutenberg/front-end.css @@ -13,8 +13,7 @@ /* Paragraphs ---------------------------------------------------------------------------- */ -.alignfull:not(.has-background) -.wp-block-group__inner-container > p:not(.has-background-color) { +.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) { padding-left: 30px; padding-right: 30px; } @@ -209,8 +208,7 @@ max-width: 80%; } -.site-container -.wp-block-pullquote:not(.is-style-solid-color)[style*="border-color"] { +.site-container .wp-block-pullquote:not(.is-style-solid-color)[style*="border-color"] { border: 2px solid; border-left: none; border-right: none; From eeecc5729fbd529d788368b5365eba61670b3552 Mon Sep 17 00:00:00 2001 From: BMO Date: Mon, 3 Aug 2020 09:14:47 -0500 Subject: [PATCH 06/11] fix: spacing in css --- lib/gutenberg/front-end.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/gutenberg/front-end.css b/lib/gutenberg/front-end.css index 9a1434ed..f821a3da 100644 --- a/lib/gutenberg/front-end.css +++ b/lib/gutenberg/front-end.css @@ -107,6 +107,7 @@ float: left; margin-left: 0; } + } /* Columns @@ -311,6 +312,7 @@ content: " "; display: table; } + } /* Other Blocks @@ -371,6 +373,7 @@ hr.wp-block-separator { margin-right: calc(-100vw / 2 + 100% / 2); width: 100vw; } + } @media only screen and (max-width: 600px) { @@ -378,6 +381,7 @@ hr.wp-block-separator { .wp-block-media-text.is-stacked-on-mobile figure { margin-bottom: 20px; } + } /* Media Queries @@ -397,6 +401,7 @@ hr.wp-block-separator { max-width: 1062px; margin: 0 auto; } + } @media only screen and (max-width: 781px) { @@ -406,4 +411,5 @@ hr.wp-block-separator { margin-left: 0; margin-right: 0; } + } From 5cc27fe2b93bde47d1a3c2870cf754124bd4a248 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Oct 2020 08:56:49 -0400 Subject: [PATCH 07/11] Bump bl from 3.0.0 to 3.0.1 (#363) Bumps [bl](https://github.com/rvagg/bl) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/rvagg/bl/releases) - [Commits](https://github.com/rvagg/bl/compare/v3.0.0...v3.0.1) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 91cbcfae..81b95141 100644 --- a/package-lock.json +++ b/package-lock.json @@ -618,9 +618,9 @@ } }, "bl": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.0.tgz", - "integrity": "sha512-EUAyP5UHU5hxF8BPT0LKW8gjYLhq1DQIcneOX/pL/m2Alo+OYDQAJlHq+yseMP50Os2nHXOSic6Ss3vSQeyf4A==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-3.0.1.tgz", + "integrity": "sha512-jrCW5ZhfQ/Vt07WX1Ngs+yn9BDqPL/gw28S7s9H6QK/gupnizNzJAss5akW20ISgOrbLTlXOOCTJeNUQqruAWQ==", "dev": true, "requires": { "readable-stream": "^3.0.1" From 358d2057917cad4de87468657bebc2d87c017ff0 Mon Sep 17 00:00:00 2001 From: BMO Date: Wed, 14 Oct 2020 09:33:18 -0500 Subject: [PATCH 08/11] ci: CircleCI Config v3 --- .circleci/config.yml | 18 ++++++++---------- .scripts/makePIServiceData.js | 24 ++++++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) 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(); From 2aff9e969680ce71cf5ea7ae9cf84a3ac7992431 Mon Sep 17 00:00:00 2001 From: Phil Johnston Date: Wed, 14 Oct 2020 13:14:07 -0400 Subject: [PATCH 09/11] 3.4.0 Version Bump --- CHANGELOG.md | 7 +++++++ package.json | 2 +- style.css | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f33cc77a..88aec439 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Genesis Sample Theme Changelog +## [3.4.0] - 2020-10-19 +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.0] - 2020-04-07 Requires WordPress 5.4 or higher. diff --git a/package.json b/package.json index dc962f27..1828b820 100644 --- 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.0", + "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 index a5dc996c..1de8e67e 100755 --- 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.0 +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 From 03e0af93993126166e8b111358432b9af4dd525e Mon Sep 17 00:00:00 2001 From: Phil Johnston Date: Thu, 15 Oct 2020 13:23:19 -0400 Subject: [PATCH 10/11] Change to direct link --- config/onboarding-shared.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/onboarding-shared.php b/config/onboarding-shared.php index b8636dfc..1dd16764 100644 --- a/config/onboarding-shared.php +++ b/config/onboarding-shared.php @@ -18,7 +18,7 @@ [ 'name' => __( 'Genesis Blocks', 'genesis-sample' ), 'slug' => 'genesis-blocks/genesis-blocks.php', - 'public_url' => 'https://wpeng.in/genesis-blocks/', + 'public_url' => 'https://wordpress.org/plugins/genesis-blocks/', ], [ 'name' => __( 'Simple Social Icons', 'genesis-sample' ), From 6546bc6fe1f524f092e1522c6d35cc339a804920 Mon Sep 17 00:00:00 2001 From: Phil Johnston Date: Mon, 19 Oct 2020 13:24:24 -0400 Subject: [PATCH 11/11] Adjust release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4480d41..f39ef612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Genesis Sample Theme Changelog -## [3.4.0] - 2020-10-19 +## [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.