Merge pull request #362 from studiopress/develop

Release 3.3.1
studiopress · Aug 17, 2020 · b8aa370 · b8aa370
2 parents 8f7c9dd + cb7b638
commit b8aa370
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 29 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,11 +18,11 @@ commands:
       - 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}
+            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"
           command: |
-            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_VERSION=$(grep 'version":' /tmp/theme/package.json | awk -F: '{print $2}' | sed -e 's/\s//g' -e 's/[\"\,]//g')" >> ${BASH_ENV}
       - run:
           name: "Set Artifact Name"
           command: |
@@ -111,12 +111,13 @@ jobs:
           at: /tmp
       - set_env_vars
       - run:
+          name: Deploy To StudioPress
           command: |
             DEST_PATH=home/wpe-user/sites/<< parameters.sp_install >>/wp-content/uploads/member-access
             DEST_HOST=<< parameters.sp_install >>@<< parameters.sp_install >>.ssh.wpengine.net
             echo "${SP_DEPLOY_KEY}" | base64 -d > ./sp_deploy_key
             chmod 600 ./sp_deploy_key
-      - run: scp -i ./sp_deploy_key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null /tmp/artifacts/${VERSION_ARTIFACT_FILE} ${DEST_HOST}:/${DEST_PATH}
+            scp -i ./sp_deploy_key -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null /tmp/artifacts/${VERSION_ARTIFACT_FILE} ${DEST_HOST}:/${DEST_PATH}
 
   deploy_s3:
     executor: python
@@ -193,7 +194,7 @@ workflows:
                 - master
       - deploy_s3:
           context: wpe-product-info-aws
-          # environment: staging/themes
+          environment: staging/themes
           requires:
             - create_data_file
             - deploy_studiopress
@@ -235,6 +236,7 @@ workflows:
             branches:
               ignore: /.*/
       - deploy_studiopress:
+          context: studiopress-deploy
           sp_install: myspress
           requires:
             - bundle

diff --git a/.scripts/makePIServiceData.js b/.scripts/makePIServiceData.js
@@ -29,7 +29,8 @@ const runScript = function() {
 	// Write data object to a JSON file
 	const themeName = process.env.THEME_SLUG || data.textdomain;
 	const themeVersion = process.env.THEME_VERSION || data.version;
-	const filePath = `${destPath}/${process.env.VERSION_DATA_FILE}` || `${destPath}/${themeName}.${themeVersion}.json`;
+	const fileName = process.env.VERSION_DATA_FILE || `${themeName}.${themeVersion}.json`;
+	const filePath = `${destPath}/${fileName}`;
 	fs.writeFileSync(filePath, JSON.stringify(data));
 }
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Genesis Sample Theme Changelog
 
+## [3.3.1] - 2020-08-17
+
+### Added
+* WordPress 5.5 block editor theme support for `custom-line-height`.
+* WordPress 5.5 block editor theme support for `custom-units`.
+* WordPress 5.5 HTML5 theme support for `navigation-widgets`.
+
+### Changed
+* Ensure front end paragraph margin matches the editor.
+* Ensure block width in the editor matches the front end.
+
+### Fixed
+* Ensure the hamburger menu button icon and text CSS transitions match.
+
+### Removed
+* `genesis-lazy-load-images` theme support in favor of the WordPress 5.5 lazy loading feature.
+
 ## [3.3.0] - 2020-04-07
 Requires WordPress 5.4 or higher.
 

diff --git a/config/theme-supports.php b/config/theme-supports.php
@@ -22,6 +22,7 @@
 		'comment-form',
 		'comment-list',
 		'gallery',
+		'navigation-widgets',
 		'search-form',
 		'script',
 		'style',
@@ -32,7 +33,6 @@
 		'search-form',
 		'skip-links',
 	],
-	'genesis-lazy-load-images'        => '',
 	'genesis-after-entry-widget-area' => '',
 	'genesis-footer-widgets'          => 3,
 	'genesis-menus'                   => [

diff --git a/languages/genesis-sample.pot b/languages/genesis-sample.pot
@@ -2,9 +2,9 @@
 # This file is distributed under the GPL-2.0-or-later.=!>
 msgid ""
 msgstr ""
-"Project-Id-Version: Genesis Sample 3.3.0\n"
+"Project-Id-Version: Genesis Sample 3.3.1\n"
 "Report-Msgid-Bugs-To: StudioPress <[email protected]>\n"
-"POT-Creation-Date: 2020-04-01 20:59:05+00:00\n"
+"POT-Creation-Date: 2020-08-14 15:48:27+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

diff --git a/lib/gutenberg/init.php b/lib/gutenberg/init.php
@@ -95,6 +95,12 @@ function genesis_sample_blocks_body_classes( $classes ) {
 // Make media embeds responsive.
 add_theme_support( 'responsive-embeds' );
 
+// Add support for custom line heights.
+add_theme_support( 'custom-line-height' );
+
+// Add support for custom units.
+add_theme_support( 'custom-units' );
+
 $genesis_sample_appearance = genesis_get_config( 'appearance' );
 
 // Adds support for editor font sizes.

diff --git a/lib/gutenberg/style-editor.css b/lib/gutenberg/style-editor.css
@@ -15,22 +15,20 @@ dl {
 }
 
 /* Regular content width.
-/* 702px + 27px to match paragraph width on front-end and editor.
 ---------------------------------------------------------------------------- */
 
 .wp-block {
-	max-width: 732px;
+	max-width: 702px;
 }
 
 /* Width of "wide" blocks
-/* 1062px + 30px so wide images match width in front-end and editor.
 /* 1062px = default column width of 702px + .alignwide negative margin of 360px
 ---------------------------------------------------------------------------- */
 
 .wp-block[data-align="full"] .wp-block[data-align="wide"],
 .wp-block[data-align="wide"] .wp-block[data-align="wide"],
 .wp-block[data-align="wide"] {
-	max-width: 1092px;
+	max-width: 1062px;
 }
 
 .wp-block[data-align="full"],

diff --git a/package-lock.json b/package-lock.json
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.0",
+		"version": "3.3.1",
 		"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.0
+Version: 3.3.1
 
 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
 
@@ -189,7 +189,7 @@ a:hover {
 }
 
 p {
-	margin: 0 0 30px;
+	margin: 0 0 28px;
 	padding: 0;
 }
 
@@ -1169,6 +1169,10 @@ figcaption,
 	content: "\f335";
 }
 
+.site-header .dashicons-before::before {
+	transition: none;
+}
+
 .site-header .menu-toggle::before {
 	float: left;
 	margin-right: 5px;