diff --git a/.circleci/config.yml b/.circleci/config.yml index 5be3389a..9a3940ff 100644 --- 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 index d67c89fa..feface7c 100644 --- 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 index f33cc77a..55df0f38 100644 --- 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 index d48bcb63..b1344e53 100644 --- 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 index 62ad97d4..be1c7cd5 100644 --- 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 \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 index e1755e2e..192b5405 100644 --- 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 index d0472141..0caa8923 100755 --- 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 index 06609f87..91cbcfae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1258,12 +1258,12 @@ } }, "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz", + "integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==", "dev": true, "requires": { - "is-obj": "^1.0.0" + "is-obj": "^2.0.0" } }, "electron-to-chromium": { @@ -2939,9 +2939,9 @@ } }, "is-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", + "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", "dev": true }, "is-plain-obj": { @@ -3195,9 +3195,9 @@ } }, "lodash": { - "version": "4.17.14", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz", - "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==", + "version": "4.17.19", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz", + "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==", "dev": true }, "lodash.defaults": { @@ -3996,12 +3996,12 @@ } }, "postcss-selector-parser": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz", - "integrity": "sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz", + "integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==", "dev": true, "requires": { - "dot-prop": "^4.1.1", + "dot-prop": "^5.2.0", "indexes-of": "^1.0.1", "uniq": "^1.0.1" } diff --git a/package.json b/package.json index dc962f27..77051462 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.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 index 4666bca4..17209e52 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.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;