diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a04a2c47..df2aab46f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,19 @@ +# [2.4.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v2.3.0...v2.4.0-epic-ras-acc.1) (2024-11-26) + + +### Bug Fixes + +* correct linting errors ([d3b74c7](https://github.com/Automattic/newspack-theme/commit/d3b74c73da1d1ff364004ca136190f00d77bc9a2)) +* correct more linting errors ([593c246](https://github.com/Automattic/newspack-theme/commit/593c24677fabba714453d8dc7c3691e759ce0d66)) +* **ras-acc:** clean up merge conflict marker ([#2335](https://github.com/Automattic/newspack-theme/issues/2335)) ([080e0fc](https://github.com/Automattic/newspack-theme/commit/080e0fc1a8e59f70fef23b7a46b11dc6f85bcf11)) +* **ras-acc:** remove redundant checkout styles ([#2350](https://github.com/Automattic/newspack-theme/issues/2350)) ([1f48f20](https://github.com/Automattic/newspack-theme/commit/1f48f2061fe40ea091fb6135444e4ada2be8012e)) + + +### Features + +* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](https://github.com/Automattic/newspack-theme/commit/63307ae052c72a9eeb753d8f45b4f0e746917991)) +* update Newspack UI variable font sizes for the theme ([212e2fd](https://github.com/Automattic/newspack-theme/commit/212e2fd95201601b77baf4c83e1b11637f045972)) + # [2.3.0](https://github.com/Automattic/newspack-theme/compare/v2.2.1...v2.3.0) (2024-11-25) @@ -20,29 +36,38 @@ * add Bluesky to the profile fields ([#2413](https://github.com/Automattic/newspack-theme/issues/2413)) ([a4eb21b](https://github.com/Automattic/newspack-theme/commit/a4eb21b46e15c54c35df6d87bfcca95cb523145e)) * add Bluesky to the Social Links menu ([#2412](https://github.com/Automattic/newspack-theme/issues/2412)) ([e32f604](https://github.com/Automattic/newspack-theme/commit/e32f6046677945f7b4d1d1c6be2c38945b37a9c3)) -# [2.3.0-alpha.2](https://github.com/Automattic/newspack-theme/compare/v2.3.0-alpha.1...v2.3.0-alpha.2) (2024-11-19) +# [2.3.0-epic-ras-acc.2](https://github.com/Automattic/newspack-theme/compare/v2.3.0-epic-ras-acc.1...v2.3.0-epic-ras-acc.2) (2024-11-20) ### Bug Fixes * getting translations to load again ([#2411](https://github.com/Automattic/newspack-theme/issues/2411)) ([110b039](https://github.com/Automattic/newspack-theme/commit/110b039b5c7d90b13c98753f8c8146071169b2bd)) -## [2.2.1](https://github.com/Automattic/newspack-theme/compare/v2.2.0...v2.2.1) (2024-11-19) +# [2.3.0-alpha.2](https://github.com/Automattic/newspack-theme/compare/v2.3.0-alpha.1...v2.3.0-alpha.2) (2024-11-19) + ### Bug Fixes * getting translations to load again ([#2411](https://github.com/Automattic/newspack-theme/issues/2411)) ([110b039](https://github.com/Automattic/newspack-theme/commit/110b039b5c7d90b13c98753f8c8146071169b2bd)) +## [2.2.1](https://github.com/Automattic/newspack-theme/compare/v2.2.0...v2.2.1) (2024-11-19) + +* getting translations to load again ([#2411](https://github.com/Automattic/newspack-theme/issues/2411)) ([110b039](https://github.com/Automattic/newspack-theme/commit/110b039b5c7d90b13c98753f8c8146071169b2bd)) -# [2.3.0-alpha.1](https://github.com/Automattic/newspack-theme/compare/v2.2.0...v2.3.0-alpha.1) (2024-11-15) +# [2.3.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v2.2.0...v2.3.0-epic-ras-acc.1) (2024-11-12) ### Bug Fixes -* make button background styles more specific ([#2407](https://github.com/Automattic/newspack-theme/issues/2407)) ([21f6a4e](https://github.com/Automattic/newspack-theme/commit/21f6a4ed62affb29854b8a8ad17dbfd42ba66cff)) +* correct linting errors ([d3b74c7](https://github.com/Automattic/newspack-theme/commit/d3b74c73da1d1ff364004ca136190f00d77bc9a2)) +* correct more linting errors ([593c246](https://github.com/Automattic/newspack-theme/commit/593c24677fabba714453d8dc7c3691e759ce0d66)) +* **ras-acc:** clean up merge conflict marker ([#2335](https://github.com/Automattic/newspack-theme/issues/2335)) ([080e0fc](https://github.com/Automattic/newspack-theme/commit/080e0fc1a8e59f70fef23b7a46b11dc6f85bcf11)) +* **ras-acc:** remove redundant checkout styles ([#2350](https://github.com/Automattic/newspack-theme/issues/2350)) ([1f48f20](https://github.com/Automattic/newspack-theme/commit/1f48f2061fe40ea091fb6135444e4ada2be8012e)) + ### Features -* **author-archive:** replace twitter icon with x ([2f4709a](https://github.com/Automattic/newspack-theme/commit/2f4709a9aa935d53d8e0aac4d205ece1865a96f1)) +* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](https://github.com/Automattic/newspack-theme/commit/63307ae052c72a9eeb753d8f45b4f0e746917991)) +* update Newspack UI variable font sizes for the theme ([212e2fd](https://github.com/Automattic/newspack-theme/commit/212e2fd95201601b77baf4c83e1b11637f045972)) # [2.2.0](https://github.com/Automattic/newspack-theme/compare/v2.1.1...v2.2.0) (2024-11-12) @@ -93,6 +118,14 @@ * add disabled styles ([#2386](https://github.com/Automattic/newspack-theme/issues/2386)) ([2f4d5a7](https://github.com/Automattic/newspack-theme/commit/2f4d5a7c7117d91c2a0eb09784ce599a6948a1c3)) +# [2.1.0-epic-ras-acc.4](https://github.com/Automattic/newspack-theme/compare/v2.1.0-epic-ras-acc.3...v2.1.0-epic-ras-acc.4) (2024-10-10) + + +### Features + +* add disabled styles ([#2386](https://github.com/Automattic/newspack-theme/issues/2386)) ([2f4d5a7](https://github.com/Automattic/newspack-theme/commit/2f4d5a7c7117d91c2a0eb09784ce599a6948a1c3)) + + ## [2.0.1](https://github.com/Automattic/newspack-theme/compare/v2.0.0...v2.0.1) (2024-10-08) @@ -108,6 +141,16 @@ ### Bug Fixes * allow active My Account links to be clicked ([#2376](https://github.com/Automattic/newspack-theme/issues/2376)) ([99e0509](https://github.com/Automattic/newspack-theme/commit/99e0509b2e00fc45bf3b2963c89fd638fe118d26)) +* avoid warnings ([#2367](https://github.com/Automattic/newspack-theme/issues/2367)) ([5218a12](https://github.com/Automattic/newspack-theme/commit/5218a1284f2dc1c66e9723dc42915d8afd9aab94)) +* downgrade octokit version to v20 ([#2370](https://github.com/Automattic/newspack-theme/issues/2370)) ([5ac4510](https://github.com/Automattic/newspack-theme/commit/5ac451004e64b1df14439218eedc74610f358540)) + +# [2.1.0-epic-ras-acc.3](https://github.com/Automattic/newspack-theme/compare/v2.1.0-epic-ras-acc.2...v2.1.0-epic-ras-acc.3) (2024-09-18) + + +### Bug Fixes + +* allow active My Account links to be clicked ([#2376](https://github.com/Automattic/newspack-theme/issues/2376)) ([99e0509](https://github.com/Automattic/newspack-theme/commit/99e0509b2e00fc45bf3b2963c89fd638fe118d26)) + ## [2.0.1-alpha.1](https://github.com/Automattic/newspack-theme/compare/v2.0.0...v2.0.1-alpha.1) (2024-08-30) @@ -120,6 +163,44 @@ # [2.0.0](https://github.com/Automattic/newspack-theme/compare/v1.92.0...v2.0.0) (2024-08-13) +### Bug Fixes + +* allow active My Account links to be clicked ([#2376](https://github.com/Automattic/newspack-theme/issues/2376)) ([99e0509](https://github.com/Automattic/newspack-theme/commit/99e0509b2e00fc45bf3b2963c89fd638fe118d26)) + +# [2.1.0-epic-ras-acc.2](https://github.com/Automattic/newspack-theme/compare/v2.1.0-epic-ras-acc.1...v2.1.0-epic-ras-acc.2) (2024-09-04) + + +### Bug Fixes + +* avoid warnings ([#2367](https://github.com/Automattic/newspack-theme/issues/2367)) ([5218a12](https://github.com/Automattic/newspack-theme/commit/5218a1284f2dc1c66e9723dc42915d8afd9aab94)) +* downgrade octokit version to v20 ([#2370](https://github.com/Automattic/newspack-theme/issues/2370)) ([5ac4510](https://github.com/Automattic/newspack-theme/commit/5ac451004e64b1df14439218eedc74610f358540)) + +# [2.1.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v2.0.0...v2.1.0-epic-ras-acc.1) (2024-08-14) + + +### Bug Fixes + +* correct linting errors ([d3b74c7](https://github.com/Automattic/newspack-theme/commit/d3b74c73da1d1ff364004ca136190f00d77bc9a2)) +* correct more linting errors ([593c246](https://github.com/Automattic/newspack-theme/commit/593c24677fabba714453d8dc7c3691e759ce0d66)) +* **ras-acc:** clean up merge conflict marker ([#2335](https://github.com/Automattic/newspack-theme/issues/2335)) ([080e0fc](https://github.com/Automattic/newspack-theme/commit/080e0fc1a8e59f70fef23b7a46b11dc6f85bcf11)) +* **ras-acc:** remove redundant checkout styles ([#2350](https://github.com/Automattic/newspack-theme/issues/2350)) ([1f48f20](https://github.com/Automattic/newspack-theme/commit/1f48f2061fe40ea091fb6135444e4ada2be8012e)) + + +### Features + +* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](https://github.com/Automattic/newspack-theme/commit/63307ae052c72a9eeb753d8f45b4f0e746917991)) +* update Newspack UI variable font sizes for the theme ([212e2fd](https://github.com/Automattic/newspack-theme/commit/212e2fd95201601b77baf4c83e1b11637f045972)) + +# [2.0.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v1.93.0-epic-ras-acc.1...v2.0.0-epic-ras-acc.1) (2024-08-09) + +### Bug Fixes + +* correct linting errors ([d3b74c7](https://github.com/Automattic/newspack-theme/commit/d3b74c73da1d1ff364004ca136190f00d77bc9a2)) +* correct more linting errors ([593c246](https://github.com/Automattic/newspack-theme/commit/593c24677fabba714453d8dc7c3691e759ce0d66)) + + +# [2.0.0](https://github.com/Automattic/newspack-theme/compare/v1.92.0...v2.0.0) (2024-08-13) + ### Bug Fixes * update dependencies to support `@wordpress/scripts` ([#2318](https://github.com/Automattic/newspack-theme/issues/2318)) ([1ee216c](https://github.com/Automattic/newspack-theme/commit/1ee216cc1815f32d028524a21a9a8a6a09cfab3f)) @@ -155,8 +236,8 @@ * chore: bump newspack-scripts to v5.5.2 -# [2.0.0-alpha.1](https://github.com/Automattic/newspack-theme/compare/v1.92.0...v2.0.0-alpha.1) (2024-08-02) +# [2.0.0-alpha.1](https://github.com/Automattic/newspack-theme/compare/v1.92.0...v2.0.0-alpha.1) (2024-08-02) ### Bug Fixes @@ -193,8 +274,37 @@ * chore: bump newspack-scripts to v5.5.2 -# [1.92.0](https://github.com/Automattic/newspack-theme/compare/v1.91.0...v1.92.0) (2024-07-30) +# [1.93.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v1.92.0...v1.93.0-epic-ras-acc.1) (2024-07-31) + +### Bug Fixes + +* **ras-acc:** clean up merge conflict marker ([#2335](https://github.com/Automattic/newspack-theme/issues/2335)) ([080e0fc](https://github.com/Automattic/newspack-theme/commit/080e0fc1a8e59f70fef23b7a46b11dc6f85bcf11)) +* **ras-acc:** remove redundant checkout styles ([#2350](https://github.com/Automattic/newspack-theme/issues/2350)) ([1f48f20](https://github.com/Automattic/newspack-theme/commit/1f48f2061fe40ea091fb6135444e4ada2be8012e)) + +### Features + +* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](https://github.com/Automattic/newspack-theme/commit/63307ae052c72a9eeb753d8f45b4f0e746917991)) +* update Newspack UI variable font sizes for the theme ([212e2fd](https://github.com/Automattic/newspack-theme/commit/212e2fd95201601b77baf4c83e1b11637f045972)) + + +# [1.92.0-epic-ras-acc.2](https://github.com/Automattic/newspack-theme/compare/v1.92.0-epic-ras-acc.1...v1.92.0-epic-ras-acc.2) (2024-07-26) + +### Bug Fixes + +* **ras-acc:** remove redundant checkout styles ([#2350](https://github.com/Automattic/newspack-theme/issues/2350)) ([1f48f20](https://github.com/Automattic/newspack-theme/commit/1f48f2061fe40ea091fb6135444e4ada2be8012e)) + + +# [1.92.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v1.91.0...v1.92.0-epic-ras-acc.1) (2024-07-17) + +### Bug Fixes + +* **ras-acc:** clean up merge conflict marker ([#2335](https://github.com/Automattic/newspack-theme/issues/2335)) ([080e0fc](https://github.com/Automattic/newspack-theme/commit/080e0fc1a8e59f70fef23b7a46b11dc6f85bcf11)) +* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](https://github.com/Automattic/newspack-theme/commit/63307ae052c72a9eeb753d8f45b4f0e746917991)) +* update Newspack UI variable font sizes for the theme ([212e2fd](https://github.com/Automattic/newspack-theme/commit/212e2fd95201601b77baf4c83e1b11637f045972)) + + +# [1.92.0](https://github.com/Automattic/newspack-theme/compare/v1.91.0...v1.92.0) (2024-07-30) ### Features @@ -223,30 +333,60 @@ ## [1.90.5](https://github.com/Automattic/newspack-theme/compare/v1.90.4...v1.90.5) (2024-07-10) + ### Bug Fixes * remove margin from grid block ([#2342](https://github.com/Automattic/newspack-theme/issues/2342)) ([854794b](https://github.com/Automattic/newspack-theme/commit/854794b5c615a3754f9c3b5352d8880499bee67f)) ## [1.91.0-alpha.2](https://github.com/Automattic/newspack-theme/compare/v1.91.0-alpha.1...v1.91.0-alpha.2) (2024-07-09) + ### Bug Fixes * correct subtitle order for WP 6.6 ([#2341](https://github.com/Automattic/newspack-theme/issues/2341)) ([e75fa8e](https://github.com/Automattic/newspack-theme/commit/e75fa8ef5ee847f5906704c535cf78bc191f2680)) ## [1.90.4](https://github.com/Automattic/newspack-theme/compare/v1.90.3...v1.90.4) (2024-07-09) + +### Bug Fixes + +* correct subtitle order for WP 6.6 ([#2341](https://github.com/Automattic/newspack-theme/issues/2341)) ([e75fa8e](https://github.com/Automattic/newspack-theme/commit/e75fa8ef5ee847f5906704c535cf78bc191f2680)) + + +## [1.91.0-epic-ras-acc.2](https://github.com/Automattic/newspack-theme/compare/v1.91.0-epic-ras-acc.1...v1.91.0-epic-ras-acc.2) (2024-07-08) + + +### Bug Fixes + +* **ras-acc:** clean up merge conflict marker ([#2335](https://github.com/Automattic/newspack-theme/issues/2335)) ([080e0fc](https://github.com/Automattic/newspack-theme/commit/080e0fc1a8e59f70fef23b7a46b11dc6f85bcf11)) + +## [1.91.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v1.90.3...v1.91.0-epic-ras-acc.1) (2024-07-03) + + +### Features + +* add support for publisher media kit ([#2317](https://github.com/Automattic/newspack-theme/issues/2317)) ([4430264](https://github.com/Automattic/newspack-theme/commit/4430264a924362138b6c31c5e33d9b78123b5378)) +* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](https://github.com/Automattic/newspack-theme/commit/63307ae052c72a9eeb753d8f45b4f0e746917991)) +* update Newspack UI variable font sizes for the theme ([212e2fd](https://github.com/Automattic/newspack-theme/commit/212e2fd95201601b77baf4c83e1b11637f045972)) + + +## [1.90.3](https://github.com/Automattic/newspack-theme/compare/v1.90.2...v1.90.3) (2024-07-01) + + ### Bug Fixes * correct subtitle order for WP 6.6 ([#2341](https://github.com/Automattic/newspack-theme/issues/2341)) ([e75fa8e](https://github.com/Automattic/newspack-theme/commit/e75fa8ef5ee847f5906704c535cf78bc191f2680)) # [1.91.0-alpha.1](https://github.com/Automattic/newspack-theme/compare/v1.90.3...v1.91.0-alpha.1) (2024-07-05) + ### Features * add support for publisher media kit ([#2317](https://github.com/Automattic/newspack-theme/issues/2317)) ([4430264](https://github.com/Automattic/newspack-theme/commit/4430264a924362138b6c31c5e33d9b78123b5378)) ## [1.90.3](https://github.com/Automattic/newspack-theme/compare/v1.90.2...v1.90.3) (2024-07-01) + ### Bug Fixes * post-release job for Node v16 ([bdbd2ca](https://github.com/Automattic/newspack-theme/commit/bdbd2caaf3e240b4e659fc00260ee9b2dd3bf489)) @@ -278,6 +418,7 @@ # [1.89.0](https://github.com/Automattic/newspack-theme/compare/v1.88.2...v1.89.0) (2024-06-12) + ### Bug Fixes * handle attachement fetch failure ([#2301](https://github.com/Automattic/newspack-theme/issues/2301)) ([6bdffe0](https://github.com/Automattic/newspack-theme/commit/6bdffe0359553999bedb960731b8897933869a7f)) @@ -287,9 +428,9 @@ * add specific css for subscribe pattern 5 and 6 ([#2305](https://github.com/Automattic/newspack-theme/issues/2305)) ([f7cf899](https://github.com/Automattic/newspack-theme/commit/f7cf899be7858a92affdd0a6d8bc668e3f9e1218)) - # [1.89.0-alpha.2](https://github.com/Automattic/newspack-theme/compare/v1.89.0-alpha.1...v1.89.0-alpha.2) (2024-06-25) + ### Bug Fixes * udpate package-lock.json ([514bf1f](https://github.com/Automattic/newspack-theme/commit/514bf1f8ca38647865783c3fed17c5b5dfb0b499)) @@ -306,6 +447,7 @@ ### Bug Fixes +* dont update option on every request ([3d30e62](https://github.com/Automattic/newspack-theme/commit/3d30e62d26968485bc9aee13b287fd37dad1d031)) * handle attachement fetch failure ([#2301](https://github.com/Automattic/newspack-theme/issues/2301)) ([6bdffe0](https://github.com/Automattic/newspack-theme/commit/6bdffe0359553999bedb960731b8897933869a7f)) @@ -313,6 +455,20 @@ * add specific css for subscribe pattern 5 and 6 ([#2305](https://github.com/Automattic/newspack-theme/issues/2305)) ([f7cf899](https://github.com/Automattic/newspack-theme/commit/f7cf899be7858a92affdd0a6d8bc668e3f9e1218)) +# [1.89.0-epic-ras-acc.2](https://github.com/Automattic/newspack-theme/compare/v1.89.0-epic-ras-acc.1...v1.89.0-epic-ras-acc.2) (2024-05-29) + +### Bug Fixes + +* dont update option on every request ([3d30e62](https://github.com/Automattic/newspack-theme/commit/3d30e62d26968485bc9aee13b287fd37dad1d031)) + +# [1.89.0-epic-ras-acc.1](https://github.com/Automattic/newspack-theme/compare/v1.88.1-epic-ras-acc.1...v1.89.0-epic-ras-acc.1) (2024-05-17) + + +### Features + +* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](https://github.com/Automattic/newspack-theme/commit/63307ae052c72a9eeb753d8f45b4f0e746917991)) +* update Newspack UI variable font sizes for the theme ([212e2fd](https://github.com/Automattic/newspack-theme/commit/212e2fd95201601b77baf4c83e1b11637f045972)) + ## [1.88.2](https://github.com/Automattic/newspack-theme/compare/v1.88.1...v1.88.2) (2024-05-28) @@ -335,6 +491,7 @@ * **homepage-posts:** handle "time ago" format in HBP ([e4e8af5](https://github.com/Automattic/newspack-theme/commit/e4e8af558c9e0e2823b3b9e4c781704cb20237ee)) * dont update option on every request ([3d30e62](https://github.com/Automattic/newspack-theme/commit/3d30e62d26968485bc9aee13b287fd37dad1d031)) + # [1.88.0](https://github.com/Automattic/newspack-theme/compare/v1.87.2...v1.88.0) (2024-05-15) diff --git a/newspack-joseph/sass/theme-description.scss b/newspack-joseph/sass/theme-description.scss index 635f0d804..4696d8e82 100644 --- a/newspack-joseph/sass/theme-description.scss +++ b/newspack-joseph/sass/theme-description.scss @@ -6,7 +6,7 @@ Author URI: https://newspack.com Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box. Requires at least: 6.6 Tested up to: 6.7 -Version: 2.3.0 +Version: 2.4.0-epic-ras-acc.1 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Template: newspack-theme diff --git a/newspack-katharine/sass/theme-description.scss b/newspack-katharine/sass/theme-description.scss index d799809dc..26ae2a6ac 100644 --- a/newspack-katharine/sass/theme-description.scss +++ b/newspack-katharine/sass/theme-description.scss @@ -6,7 +6,7 @@ Author URI: https://newspack.com Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box. Requires at least: 6.6 Tested up to: 6.7 -Version: 2.3.0 +Version: 2.4.0-epic-ras-acc.1 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Template: newspack-theme diff --git a/newspack-nelson/sass/theme-description.scss b/newspack-nelson/sass/theme-description.scss index 2ae4d4647..73d5e0b33 100644 --- a/newspack-nelson/sass/theme-description.scss +++ b/newspack-nelson/sass/theme-description.scss @@ -6,7 +6,11 @@ Author URI: https://newspack.com Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box. Requires at least: 6.6 Tested up to: 6.7 +<<<<<<< HEAD +Version: 2.4.0-epic-ras-acc.1 +======= Version: 2.3.0 +>>>>>>> release License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Template: newspack-theme diff --git a/newspack-sacha/sass/theme-description.scss b/newspack-sacha/sass/theme-description.scss index d04c85ef7..5000225d0 100644 --- a/newspack-sacha/sass/theme-description.scss +++ b/newspack-sacha/sass/theme-description.scss @@ -6,7 +6,7 @@ Author URI: https://newspack.com Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box. Requires at least: 6.6 Tested up to: 6.7 -Version: 2.3.0 +Version: 2.4.0-epic-ras-acc.1 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Template: newspack-theme diff --git a/newspack-scott/sass/theme-description.scss b/newspack-scott/sass/theme-description.scss index b4f62b9b8..d68ca64b6 100644 --- a/newspack-scott/sass/theme-description.scss +++ b/newspack-scott/sass/theme-description.scss @@ -6,7 +6,7 @@ Author URI: https://newspack.com Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box. Requires at least: 6.6 Tested up to: 6.7 -Version: 2.3.0 +Version: 2.4.0-epic-ras-acc.1 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Template: newspack-theme diff --git a/newspack-theme/sass/plugins/woocommerce.scss b/newspack-theme/sass/plugins/woocommerce.scss index 2991d6684..81d01b1d9 100644 --- a/newspack-theme/sass/plugins/woocommerce.scss +++ b/newspack-theme/sass/plugins/woocommerce.scss @@ -1581,13 +1581,6 @@ table.woocommerce-table--order-details.shop_table, .woocommerce-product-gallery__trigger { right: 1rem; } - - .wc_payment_method { - > label:first-of-type img { - float: none; - margin-left: 0.5 * structure.$size__spacing-unit; - } - } } @media only screen and ( min-width: 768px ) { diff --git a/newspack-theme/sass/theme-description.scss b/newspack-theme/sass/theme-description.scss index 2782cbc75..e1850f5fb 100644 --- a/newspack-theme/sass/theme-description.scss +++ b/newspack-theme/sass/theme-description.scss @@ -6,7 +6,7 @@ Author URI: https://newspack.com Description: The official theme for Newspack, an all-in-one platform that simplifies publishing and drives audience and revenue right out of the box. Requires at least: 6.6 Tested up to: 6.7 -Version: 2.3.0 +Version: 2.4.0-epic-ras-acc.1 License: GNU General Public License v2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html Text Domain: newspack diff --git a/newspack-theme/sass/variables-site/_newspack-ui.scss b/newspack-theme/sass/variables-site/_newspack-ui.scss new file mode 100644 index 000000000..fd5747036 --- /dev/null +++ b/newspack-theme/sass/variables-site/_newspack-ui.scss @@ -0,0 +1,25 @@ +@use "../mixins/utilities"; + +html body { + // Override the Newspack UI font sizes to be based off of the Newspack Theme's 18px font base: + --newspack-ui-font-size-m: clamp(1rem, 0.04rem + 2.209vw, 1.611rem); // 18px - 20px + --newspack-ui-font-size-l: clamp(1.111rem, 0.762rem + 0.803vw, 1.333rem); // 20px - 24px + --newspack-ui-font-size-xl: clamp(1.222rem, 0.35rem + 2.008vw, 1.778rem); // 22px - 32px + --newspack-ui-font-size-2xl: clamp(1.444rem, 0.049rem + 3.213vw, 2.333rem); // 26px - 42px + --newspack-ui-font-size-3xl: clamp(1.556rem, -0.189rem + 4.016vw, 2.667rem); // 28px - 48px + --newspack-ui-font-size-4xl: clamp(1.778rem, -1.014rem + 6.426vw, 3.556rem); // 32px - 64px + --newspack-ui-font-size-5xl: clamp(1.889rem, -2.124rem + 9.237vw, 4.444rem); // 34px - 80px + --newspack-ui-font-size-6xl: clamp(2rem, -3.234rem + 12.048vw, 5.333rem); // 36px - 96px + + @include utilities.media( mobile ) { + // Override the Newspack UI font sizes to be based off of the Newspack Theme's 20px font base on desktop: + --newspack-ui-font-size-m: clamp(0.9rem, 0.743rem + 0.402vw, 1rem); // 18px - 20px + --newspack-ui-font-size-l: clamp(1rem, 0.686rem + 0.803vw, 1.2rem); // 20px - 24px + --newspack-ui-font-size-xl: clamp(1.1rem, 0.315rem + 2.008vw, 1.6rem); // 22px - 32px + --newspack-ui-font-size-2xl: clamp(1.3rem, 0.044rem + 3.213vw, 2.1rem); // 26px - 42px + --newspack-ui-font-size-3xl: clamp(1.4rem, -0.17rem + 4.016vw, 2.4rem); // 28px - 48px + --newspack-ui-font-size-4xl: clamp(1.6rem, -0.912rem + 6.426vw, 3.2rem); // 32px - 64px + --newspack-ui-font-size-5xl: clamp(1.7rem, -1.912rem + 9.237vw, 4rem); // 34px - 80px + --newspack-ui-font-size-6xl: clamp(1.8rem, -2.911rem + 12.048vw, 4.8rem); // 36px - 96px + } +} diff --git a/newspack-theme/sass/variables-site/_variables-site.scss b/newspack-theme/sass/variables-site/_variables-site.scss index 23c86687c..b144d3453 100755 --- a/newspack-theme/sass/variables-site/_variables-site.scss +++ b/newspack-theme/sass/variables-site/_variables-site.scss @@ -1,2 +1,3 @@ +@use "newspack-ui"; @use "structure"; @use "transitions"; diff --git a/package-lock.json b/package-lock.json index c7507b195..7b1f846e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,16 @@ { "name": "newspack", - "version": "2.3.0", + "version": "2.3.0-epic-ras-acc.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "newspack", +<<<<<<< HEAD + "version": "2.3.0-epic-ras-acc.2", +======= "version": "2.3.0", +>>>>>>> release "devDependencies": { "@octokit/rest": "^20.0.2", "@rushstack/eslint-patch": "^1.10.4", diff --git a/package.json b/package.json index 6697341bf..03e533732 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "newspack", - "version": "2.3.0", + "version": "2.4.0-epic-ras-acc.1", "description": "A theme for Newspack. https://newspack.com", "bugs": { "url": "https://github.com/Automattic/newspack-theme/issues" diff --git a/scripts/create-child-releases.js b/scripts/create-child-releases.js index 400fee7b0..b88046c2d 100644 --- a/scripts/create-child-releases.js +++ b/scripts/create-child-releases.js @@ -1,4 +1,4 @@ -/* eslint-disable no-console */ +/* eslint-disable no-console, @typescript-eslint/no-var-requires */ const { basename, resolve } = require( 'path' ); const { stat, readFile } = require( 'fs-extra' );