From b32c768ea99021bf6df42526914eb04cac226bac Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 02:07:43 +0000
Subject: [PATCH 1/8] chore(deps-dev): bump @wordpress/browserslist-config

Bumps [@wordpress/browserslist-config](https://github.com/WordPress/gutenberg/tree/HEAD/packages/browserslist-config) from 6.11.0 to 6.12.0.
- [Release notes](https://github.com/WordPress/gutenberg/releases)
- [Changelog](https://github.com/WordPress/gutenberg/blob/@wordpress/browserslist-config@6.12.0/packages/browserslist-config/CHANGELOG.md)
- [Commits](https://github.com/WordPress/gutenberg/commits/@wordpress/browserslist-config@6.12.0/packages/browserslist-config)

---
updated-dependencies:
- dependency-name: "@wordpress/browserslist-config"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bc0ac8fe8..86b41e0a8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
 			"devDependencies": {
 				"@octokit/rest": "^20.0.2",
 				"@rushstack/eslint-patch": "^1.10.4",
-				"@wordpress/browserslist-config": "^6.11.0",
+				"@wordpress/browserslist-config": "^6.12.0",
 				"chokidar-cli": "^3.0.0",
 				"classnames": "^2.5.1",
 				"cssnano": "^7.0.6",
@@ -7270,9 +7270,9 @@
 			}
 		},
 		"node_modules/@wordpress/browserslist-config": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.11.0.tgz",
-			"integrity": "sha512-wUDbJ3x7c8iMZLtwo+7VlWZ/vDc47PDW2eSAKW18RrQBSTdaNmWi4qiyFYi7Ye2XkyfUd2gp71MTJjZi6n/V2A==",
+			"version": "6.12.0",
+			"resolved": "https://registry.npmjs.org/@wordpress/browserslist-config/-/browserslist-config-6.12.0.tgz",
+			"integrity": "sha512-rFsMgWpJSu6I4rgqIGr/+ofVC4hsGIpJCXorNpRX8Zdo6wZvo/jHCZfOHq1RQ0dw9kNM2Q5UE5Sve1XpsDWPXA==",
 			"dev": true,
 			"engines": {
 				"node": ">=18.12.0",
diff --git a/package.json b/package.json
index fab583cf1..740fca59a 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
 	"devDependencies": {
 		"@octokit/rest": "^20.0.2",
 		"@rushstack/eslint-patch": "^1.10.4",
-		"@wordpress/browserslist-config": "^6.11.0",
+		"@wordpress/browserslist-config": "^6.12.0",
 		"chokidar-cli": "^3.0.0",
 		"classnames": "^2.5.1",
 		"cssnano": "^7.0.6",

From c41067265e3c8a2d46d723d5af4c95b1ba5c9726 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 02:08:01 +0000
Subject: [PATCH 2/8] chore(deps-dev): bump sass from 1.80.6 to 1.81.0

Bumps [sass](https://github.com/sass/dart-sass) from 1.80.6 to 1.81.0.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.80.6...1.81.0)

---
updated-dependencies:
- dependency-name: sass
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 86b41e0a8..324b8d5d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
 				"postcss-focus-within": "^9.0.1",
 				"postcss-scss": "^4.0.9",
 				"rtlcss": "^4.3.0",
-				"sass": "^1.80.6"
+				"sass": "^1.81.0"
 			}
 		},
 		"node_modules/@adobe/css-tools": {
@@ -15964,9 +15964,9 @@
 			"dev": true
 		},
 		"node_modules/immutable": {
-			"version": "4.3.6",
-			"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz",
-			"integrity": "sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==",
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/immutable/-/immutable-5.0.2.tgz",
+			"integrity": "sha512-1NU7hWZDkV7hJ4PJ9dur9gTNQ4ePNPN4k9/0YhwjzykTi/+3Q5pF93YU5QoVj8BuOnhLgaY8gs0U2pj4kSYVcw==",
 			"dev": true
 		},
 		"node_modules/import-fresh": {
@@ -26477,13 +26477,13 @@
 			"dev": true
 		},
 		"node_modules/sass": {
-			"version": "1.80.6",
-			"resolved": "https://registry.npmjs.org/sass/-/sass-1.80.6.tgz",
-			"integrity": "sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==",
+			"version": "1.81.0",
+			"resolved": "https://registry.npmjs.org/sass/-/sass-1.81.0.tgz",
+			"integrity": "sha512-Q4fOxRfhmv3sqCLoGfvrC9pRV8btc0UtqL9mN6Yrv6Qi9ScL55CVH1vlPP863ISLEEMNLLuu9P+enCeGHlnzhA==",
 			"dev": true,
 			"dependencies": {
 				"chokidar": "^4.0.0",
-				"immutable": "^4.0.0",
+				"immutable": "^5.0.2",
 				"source-map-js": ">=0.6.2 <2.0.0"
 			},
 			"bin": {
diff --git a/package.json b/package.json
index 740fca59a..93f15e723 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
 		"postcss-focus-within": "^9.0.1",
 		"postcss-scss": "^4.0.9",
 		"rtlcss": "^4.3.0",
-		"sass": "^1.80.6"
+		"sass": "^1.81.0"
 	},
 	"overrides": {
 		"terser-webpack-plugin": {

From 16a33aa7bcb13182b4610520313be93d8322d956 Mon Sep 17 00:00:00 2001
From: Laurel <laurel.fulford@automattic.com>
Date: Wed, 20 Nov 2024 04:37:54 -0800
Subject: [PATCH 3/8] feat: add Bluesky to the Social Links menu (#2412)

* feat: add Bluesky support to the social links menu

* fix: remove inline fill
---
 newspack-theme/classes/class-newspack-svg-icons.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/newspack-theme/classes/class-newspack-svg-icons.php b/newspack-theme/classes/class-newspack-svg-icons.php
index a97ca17c9..292b0c49e 100755
--- a/newspack-theme/classes/class-newspack-svg-icons.php
+++ b/newspack-theme/classes/class-newspack-svg-icons.php
@@ -244,6 +244,9 @@ public static function get_social_icons_map() {
 		'behance'     => array(
 			'behance.net',
 		),
+		'bluesky'     => array(
+			'bsky.app',
+		),
 		'codepen'     => array(
 			'codepen.io',
 		),
@@ -343,6 +346,11 @@ public static function get_social_icons_map() {
 	<path d="M7.799,5.698c0.589,0,1.12,0.051,1.606,0.156c0.482,0.102,0.894,0.273,1.241,0.507c0.344,0.235,0.612,0.546,0.804,0.938 c0.188,0.387,0.281,0.871,0.281,1.443c0,0.619-0.141,1.137-0.421,1.551c-0.284,0.413-0.7,0.751-1.255,1.014 c0.756,0.218,1.317,0.601,1.689,1.146c0.374,0.549,0.557,1.205,0.557,1.975c0,0.623-0.12,1.161-0.359,1.612 c-0.241,0.457-0.569,0.828-0.973,1.114c-0.408,0.288-0.876,0.5-1.399,0.637C9.052,17.931,8.514,18,7.963,18H2V5.698H7.799 M7.449,10.668c0.481,0,0.878-0.114,1.192-0.345c0.311-0.228,0.463-0.603,0.463-1.119c0-0.286-0.051-0.523-0.152-0.707 C8.848,8.315,8.711,8.171,8.536,8.07C8.362,7.966,8.166,7.894,7.94,7.854c-0.224-0.044-0.457-0.06-0.697-0.06H4.709v2.874H7.449z M7.6,15.905c0.267,0,0.521-0.024,0.759-0.077c0.243-0.053,0.457-0.137,0.637-0.261c0.182-0.12,0.332-0.283,0.441-0.491 C9.547,14.87,9.6,14.602,9.6,14.278c0-0.633-0.18-1.084-0.533-1.357c-0.356-0.27-0.83-0.404-1.413-0.404H4.709v3.388L7.6,15.905z M16.162,15.864c0.367,0.358,0.897,0.538,1.583,0.538c0.493,0,0.92-0.125,1.277-0.374c0.354-0.248,0.571-0.514,0.654-0.79h2.155 c-0.347,1.072-0.872,1.838-1.589,2.299C19.534,18,18.67,18.23,17.662,18.23c-0.701,0-1.332-0.113-1.899-0.337 c-0.567-0.227-1.041-0.544-1.439-0.958c-0.389-0.415-0.689-0.907-0.904-1.484c-0.213-0.574-0.32-1.21-0.32-1.899 c0-0.666,0.11-1.288,0.329-1.863c0.222-0.577,0.529-1.075,0.933-1.492c0.406-0.42,0.885-0.751,1.444-0.994 c0.558-0.241,1.175-0.363,1.857-0.363c0.754,0,1.414,0.145,1.98,0.44c0.563,0.291,1.026,0.686,1.389,1.181 c0.363,0.493,0.622,1.057,0.783,1.69c0.16,0.632,0.217,1.292,0.171,1.983h-6.428C15.557,14.84,15.795,15.506,16.162,15.864 M18.973,11.184c-0.291-0.321-0.783-0.496-1.384-0.496c-0.39,0-0.714,0.066-0.973,0.2c-0.254,0.132-0.461,0.297-0.621,0.491 c-0.157,0.197-0.265,0.405-0.328,0.628c-0.063,0.217-0.101,0.413-0.111,0.587h3.98C19.478,11.969,19.265,11.509,18.973,11.184z M15.057,7.738h4.985V6.524h-4.985L15.057,7.738z"></path>
 </svg>',
 
+		'bluesky'     => '
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+	<path d="M6.33525 4.1443C8.6282 5.80613 11.0944 9.17571 12 10.9838C12.9056 9.17571 15.3718 5.80613 17.6648 4.1443C19.3192 2.94521 22 2.01741 22 4.96972C22 5.55931 21.6498 9.92278 21.4444 10.6312C20.7305 13.0941 18.1291 13.7222 15.815 13.342C19.8599 14.0066 20.8889 16.2079 18.6667 18.4093C14.4462 22.59 12.6007 17.3603 12.1279 16.0203C12.0412 15.7746 12.0006 15.6597 12 15.7574C11.9994 15.6597 11.9588 15.7746 11.8721 16.0203C11.3993 17.3603 9.55377 22.59 5.33333 18.4093C3.11111 16.2079 4.14006 14.0066 8.18496 13.342C5.87088 13.7222 3.26949 13.0941 2.55556 10.6312C2.35018 9.92278 2 5.55931 2 4.96972C2 2.01741 4.68079 2.94521 6.33525 4.1443Z"/>
+</svg>',
+
 		'chain'       => '
 <svg viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 	<path d="M19.647,16.706a1.134,1.134,0,0,0-.343-.833l-2.549-2.549a1.134,1.134,0,0,0-.833-.343,1.168,1.168,0,0,0-.883.392l.233.226q.2.189.264.264a2.922,2.922,0,0,1,.184.233.986.986,0,0,1,.159.312,1.242,1.242,0,0,1,.043.337,1.172,1.172,0,0,1-1.176,1.176,1.237,1.237,0,0,1-.337-.043,1,1,0,0,1-.312-.159,2.76,2.76,0,0,1-.233-.184q-.073-.068-.264-.264l-.226-.233a1.19,1.19,0,0,0-.4.895,1.134,1.134,0,0,0,.343.833L15.837,19.3a1.13,1.13,0,0,0,.833.331,1.18,1.18,0,0,0,.833-.318l1.8-1.789a1.12,1.12,0,0,0,.343-.821Zm-8.615-8.64a1.134,1.134,0,0,0-.343-.833L8.163,4.7a1.134,1.134,0,0,0-.833-.343,1.184,1.184,0,0,0-.833.331L4.7,6.473a1.12,1.12,0,0,0-.343.821,1.134,1.134,0,0,0,.343.833l2.549,2.549a1.13,1.13,0,0,0,.833.331,1.184,1.184,0,0,0,.883-.38L8.728,10.4q-.2-.189-.264-.264A2.922,2.922,0,0,1,8.28,9.9a.986.986,0,0,1-.159-.312,1.242,1.242,0,0,1-.043-.337A1.172,1.172,0,0,1,9.254,8.079a1.237,1.237,0,0,1,.337.043,1,1,0,0,1,.312.159,2.761,2.761,0,0,1,.233.184q.073.068.264.264l.226.233a1.19,1.19,0,0,0,.4-.895ZM22,16.706a3.343,3.343,0,0,1-1.042,2.488l-1.8,1.789a3.536,3.536,0,0,1-4.988-.025l-2.525-2.537a3.384,3.384,0,0,1-1.017-2.488,3.448,3.448,0,0,1,1.078-2.561l-1.078-1.078a3.434,3.434,0,0,1-2.549,1.078,3.4,3.4,0,0,1-2.5-1.029L3.029,9.794A3.4,3.4,0,0,1,2,7.294,3.343,3.343,0,0,1,3.042,4.806l1.8-1.789A3.384,3.384,0,0,1,7.331,2a3.357,3.357,0,0,1,2.5,1.042l2.525,2.537a3.384,3.384,0,0,1,1.017,2.488,3.448,3.448,0,0,1-1.078,2.561l1.078,1.078a3.551,3.551,0,0,1,5.049-.049l2.549,2.549A3.4,3.4,0,0,1,22,16.706Z"></path>

From ad87037328d03dd150e2010d05135b5cb54638f1 Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@gmail.com>
Date: Wed, 20 Nov 2024 10:30:31 -0300
Subject: [PATCH 4/8] chore: remove dependabot pulls from changelog workflow
 (#2414)

---
 .github/workflows/changelog.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 52534ece6..85f67cbd8 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -5,7 +5,7 @@ on:
 
 jobs:
   labeler:
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
     permissions:
       contents: read
       pull-requests: write
@@ -14,7 +14,7 @@ jobs:
     - uses: actions/labeler@v5
 
   comment_pr:
-    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
     permissions:
       contents: read
       pull-requests: write
@@ -25,7 +25,7 @@ jobs:
         uses: thollander/actions-comment-pull-request@v3
         with:
           message: |
-            Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:
+            Hey @${{ github.event.pull_request.user.login }}, good job getting this PR merged! :tada:
 
             Now, the `needs-changelog` label has been added to it.
 

From 6651f67254d4ccb877e12c3da52067cc10aa470e Mon Sep 17 00:00:00 2001
From: leogermani <leogermani@gmail.com>
Date: Thu, 21 Nov 2024 16:04:27 -0300
Subject: [PATCH 5/8] feat: add Bluesky to the profile fields (#2413)

---
 newspack-theme/functions.php                  |  7 ++++
 newspack-theme/inc/template-tags.php          |  1 +
 .../inc/yoast-bluesky-contact-method.php      | 27 +++++++++++++++
 newspack-theme/inc/yoast.php                  | 34 +++++++++++++++++++
 4 files changed, 69 insertions(+)
 create mode 100644 newspack-theme/inc/yoast-bluesky-contact-method.php
 create mode 100644 newspack-theme/inc/yoast.php

diff --git a/newspack-theme/functions.php b/newspack-theme/functions.php
index 23fcf6dcb..8063830b0 100755
--- a/newspack-theme/functions.php
+++ b/newspack-theme/functions.php
@@ -1362,3 +1362,10 @@ function newspack_dequeue_mediaelement() {
  * Woo Templates cache handling
  */
 require get_template_directory() . '/woocommerce/templates.php';
+
+/**
+ * Yoast customizations
+ */
+if ( class_exists( 'WPSEO_Options' ) ) {
+	require get_template_directory() . '/inc/yoast.php';
+}
diff --git a/newspack-theme/inc/template-tags.php b/newspack-theme/inc/template-tags.php
index 1e5aa3bae..45b0db48f 100755
--- a/newspack-theme/inc/template-tags.php
+++ b/newspack-theme/inc/template-tags.php
@@ -199,6 +199,7 @@ function newspack_author_get_social_links( $author_id, $size = 24 ) {
 			'tumblr',
 			'youtube',
 			'wikipedia',
+			'bluesky',
 		);
 
 		// Create empty string for links.
diff --git a/newspack-theme/inc/yoast-bluesky-contact-method.php b/newspack-theme/inc/yoast-bluesky-contact-method.php
new file mode 100644
index 000000000..c040d5bf4
--- /dev/null
+++ b/newspack-theme/inc/yoast-bluesky-contact-method.php
@@ -0,0 +1,27 @@
+<?php // phpcs:disable
+
+use Yoast\WP\SEO\User_Meta\Domain\Additional_Contactmethod_Interface;
+
+/**
+ * The Facebook contactmethod.
+ */
+class Newspack_Theme_Bluesky implements Additional_Contactmethod_Interface {
+
+	/**
+	 * Returns the key of the Bluesky contactmethod.
+	 *
+	 * @return string The key of the Bluesky contactmethod.
+	 */
+	public function get_key(): string {
+		return 'bluesky';
+	}
+
+	/**
+	 * Returns the label of the Bluesky field.
+	 *
+	 * @return string The label of the Bluesky field.
+	 */
+	public function get_label(): string {
+		return \__( 'Bluesky profile URL', 'newspack-theme' );
+	}
+}
diff --git a/newspack-theme/inc/yoast.php b/newspack-theme/inc/yoast.php
new file mode 100644
index 000000000..7d981547a
--- /dev/null
+++ b/newspack-theme/inc/yoast.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Newspack Theme: Yoast customizations.
+ *
+ * @package Newspack
+ */
+
+add_action( 'after_setup_theme', 'newspack_theme_yoast_init', 20 );
+
+/**
+ * Add support for the Bluesky contact method while Yoast doesn't.
+ *
+ * @return void
+ */
+function newspack_theme_yoast_init() {
+
+	if ( class_exists( 'Yoast\WP\SEO\User_Meta\Framework\Additional_Contactmethods\Facebook' ) ) {
+		require_once get_template_directory() . '/inc/yoast-bluesky-contact-method.php';
+		add_filter(
+			'wpseo_additional_contactmethods',
+			function( $contact_methods ) {
+
+				// Bail if the Bluesky contact method is already registered.
+				foreach ( $contact_methods as $contact_method ) {
+					if ( 'bluesky' === $contact_method->get_key() ) {
+						return $contact_methods;
+					}
+				}
+				$contact_methods[] = new Newspack_Theme_Bluesky();
+				return $contact_methods;
+			}
+		);
+	}
+}

From da4efd9adc8f0bbcdf9e29ae193f619a06f06915 Mon Sep 17 00:00:00 2001
From: Laurel <laurel.fulford@automattic.com>
Date: Tue, 26 Nov 2024 16:31:02 -0800
Subject: [PATCH 6/8] fix: remove translation workaround; the issue is fixed in
 WP (#2415)

---
 newspack-theme/functions.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/newspack-theme/functions.php b/newspack-theme/functions.php
index 8063830b0..8701e3b3c 100755
--- a/newspack-theme/functions.php
+++ b/newspack-theme/functions.php
@@ -42,11 +42,7 @@ function newspack_setup() {
 		 * If you're building a theme based on Newspack Theme, use a find and replace
 		 * to change 'newspack' to the name of your theme in all the template files.
 		 */
-		if ( version_compare( $GLOBALS['wp_version'], '6.7', '<' ) ) {
-			load_theme_textdomain( 'newspack', get_template_directory() . '/languages' );
-		} else {
-			load_textdomain( 'newspack', get_template_directory() . '/languages/' . determine_locale() . '.mo' );
-		}
+		load_theme_textdomain( 'newspack', get_template_directory() . '/languages' );
 
 		// Add default posts and comments RSS feed links to head.
 		add_theme_support( 'automatic-feed-links' );

From 4488d59a8ca94675be4f8ec0704be5d66f6c455b Mon Sep 17 00:00:00 2001
From: Laurel <laurel.fulford@automattic.com>
Date: Thu, 28 Nov 2024 10:40:32 -0800
Subject: [PATCH 7/8]  feat: merge RAS-ACC work into trunk (#2417)

This PR adds features and styles for the new reader activation and account creation flow.

Co-authored-by: Thomas Guillot <thomasguillot@users.noreply.github.com>
Co-authored-by: Rasmy Nguyen <raz@automattic.com>
---
 CHANGELOG.md                                  | 173 +++++++++++++++++-
 newspack-joseph/sass/theme-description.scss   |   2 +-
 .../sass/theme-description.scss               |   2 +-
 newspack-nelson/sass/theme-description.scss   |   4 +
 newspack-sacha/sass/theme-description.scss    |   2 +-
 newspack-scott/sass/theme-description.scss    |   2 +-
 newspack-theme/sass/plugins/woocommerce.scss  |   7 -
 newspack-theme/sass/theme-description.scss    |   2 +-
 .../sass/variables-site/_newspack-ui.scss     |  25 +++
 .../sass/variables-site/_variables-site.scss  |   1 +
 package-lock.json                             |   6 +-
 package.json                                  |   2 +-
 scripts/create-child-releases.js              |   2 +-
 13 files changed, 207 insertions(+), 23 deletions(-)
 create mode 100644 newspack-theme/sass/variables-site/_newspack-ui.scss

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' );

From f75ad19d7e777c00405256184acc13a988c5e269 Mon Sep 17 00:00:00 2001
From: matticbot <semantic-release-bot@martynus.net>
Date: Fri, 29 Nov 2024 16:33:34 +0000
Subject: [PATCH 8/8] chore(release): 2.4.0-alpha.1 [skip ci]

# [2.4.0-alpha.1](https://github.com/Automattic/newspack-theme/compare/v2.3.0...v2.4.0-alpha.1) (2024-11-29)

### Bug Fixes

* remove translation workaround; the issue is fixed in WP ([#2415](https://github.com/Automattic/newspack-theme/issues/2415)) ([da4efd9](https://github.com/Automattic/newspack-theme/commit/da4efd9adc8f0bbcdf9e29ae193f619a06f06915))

### Features

* add Bluesky to the profile fields ([#2413](https://github.com/Automattic/newspack-theme/issues/2413)) ([6651f67](https://github.com/Automattic/newspack-theme/commit/6651f67254d4ccb877e12c3da52067cc10aa470e))
* add Bluesky to the Social Links menu ([#2412](https://github.com/Automattic/newspack-theme/issues/2412)) ([16a33aa](https://github.com/Automattic/newspack-theme/commit/16a33aa7bcb13182b4610520313be93d8322d956))
* merge RAS-ACC work into trunk ([#2417](https://github.com/Automattic/newspack-theme/issues/2417)) ([4488d59](https://github.com/Automattic/newspack-theme/commit/4488d59a8ca94675be4f8ec0704be5d66f6c455b))
---
 CHANGELOG.md                                   | 14 ++++++++++++++
 newspack-joseph/sass/theme-description.scss    |  2 +-
 newspack-katharine/sass/theme-description.scss |  2 +-
 newspack-nelson/sass/theme-description.scss    |  2 +-
 newspack-sacha/sass/theme-description.scss     |  2 +-
 newspack-scott/sass/theme-description.scss     |  2 +-
 newspack-theme/sass/theme-description.scss     |  2 +-
 package.json                                   |  2 +-
 8 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df2aab46f..8c3eff454 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [2.4.0-alpha.1](https://github.com/Automattic/newspack-theme/compare/v2.3.0...v2.4.0-alpha.1) (2024-11-29)
+
+
+### Bug Fixes
+
+* remove translation workaround; the issue is fixed in WP ([#2415](https://github.com/Automattic/newspack-theme/issues/2415)) ([da4efd9](https://github.com/Automattic/newspack-theme/commit/da4efd9adc8f0bbcdf9e29ae193f619a06f06915))
+
+
+### Features
+
+* add Bluesky to the profile fields ([#2413](https://github.com/Automattic/newspack-theme/issues/2413)) ([6651f67](https://github.com/Automattic/newspack-theme/commit/6651f67254d4ccb877e12c3da52067cc10aa470e))
+* add Bluesky to the Social Links menu ([#2412](https://github.com/Automattic/newspack-theme/issues/2412)) ([16a33aa](https://github.com/Automattic/newspack-theme/commit/16a33aa7bcb13182b4610520313be93d8322d956))
+* merge RAS-ACC work into trunk ([#2417](https://github.com/Automattic/newspack-theme/issues/2417)) ([4488d59](https://github.com/Automattic/newspack-theme/commit/4488d59a8ca94675be4f8ec0704be5d66f6c455b))
+
 # [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)
 
 
diff --git a/newspack-joseph/sass/theme-description.scss b/newspack-joseph/sass/theme-description.scss
index 4696d8e82..01a8001dc 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.4.0-epic-ras-acc.1
+Version: 2.4.0-alpha.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 26ae2a6ac..e4ab145e6 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.4.0-epic-ras-acc.1
+Version: 2.4.0-alpha.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 73d5e0b33..81d0b8459 100644
--- a/newspack-nelson/sass/theme-description.scss
+++ b/newspack-nelson/sass/theme-description.scss
@@ -7,7 +7,7 @@ Description: The official theme for Newspack, an all-in-one platform that simpli
 Requires at least: 6.6
 Tested up to: 6.7
 <<<<<<< HEAD
-Version: 2.4.0-epic-ras-acc.1
+Version: 2.4.0-alpha.1
 =======
 Version: 2.3.0
 >>>>>>> release
diff --git a/newspack-sacha/sass/theme-description.scss b/newspack-sacha/sass/theme-description.scss
index 5000225d0..5df86437b 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.4.0-epic-ras-acc.1
+Version: 2.4.0-alpha.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 d68ca64b6..2f636a427 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.4.0-epic-ras-acc.1
+Version: 2.4.0-alpha.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/theme-description.scss b/newspack-theme/sass/theme-description.scss
index e1850f5fb..8399dc41f 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.4.0-epic-ras-acc.1
+Version: 2.4.0-alpha.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/package.json b/package.json
index 03e533732..70158a8e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "newspack",
-	"version": "2.4.0-epic-ras-acc.1",
+	"version": "2.4.0-alpha.1",
 	"description": "A theme for Newspack. https://newspack.com",
 	"bugs": {
 		"url": "https://github.com/Automattic/newspack-theme/issues"