Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ras-acc): revert RAS-ACC release #2422

Draft
wants to merge 2 commits into
base: release
Choose a base branch
from
+45 −253
Draft

fix(ras-acc): revert RAS-ACC release #2422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9a78df
Revert "chore(release): 2.4.0 [skip ci]"
dkoo Dec 9, 2024
aeb1ce2
Revert "Merge pull request #2421 from Automattic/alpha"
dkoo Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
labeler:
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk' && github.event.pull_request.user.login != 'dependabot[bot]'
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
permissions:
contents: read
pull-requests: write
Expand All @@ -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' && github.event.pull_request.user.login != 'dependabot[bot]'
if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'trunk'
permissions:
contents: read
pull-requests: write
Expand All @@ -25,7 +25,7 @@ jobs:
uses: thollander/actions-comment-pull-request@v3
with:
message: |
Hey @${{ github.event.pull_request.user.login }}, good job getting this PR merged! :tada:
Hey @${{ github.event.pull_request.assignee.login }}, good job getting this PR merged! :tada:

Now, the `needs-changelog` label has been added to it.

Expand Down
201 changes: 8 additions & 193 deletions CHANGELOG.md
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion newspack-joseph/sass/theme-description.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Version: 2.3.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Template: newspack-theme
Expand Down
2 changes: 1 addition & 1 deletion newspack-katharine/sass/theme-description.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Version: 2.3.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Template: newspack-theme
Expand Down
4 changes: 0 additions & 4 deletions newspack-nelson/sass/theme-description.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +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
<<<<<<< HEAD
Version: 2.4.0
=======
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
Expand Down
2 changes: 1 addition & 1 deletion newspack-sacha/sass/theme-description.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Version: 2.3.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Template: newspack-theme
Expand Down
2 changes: 1 addition & 1 deletion newspack-scott/sass/theme-description.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Version: 2.3.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Template: newspack-theme
Expand Down
6 changes: 5 additions & 1 deletion newspack-theme/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ 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.
*/
load_theme_textdomain( 'newspack', get_template_directory() . '/languages' );
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' );
}

// Add default posts and comments RSS feed links to head.
add_theme_support( 'automatic-feed-links' );
Expand Down
7 changes: 7 additions & 0 deletions newspack-theme/sass/plugins/woocommerce.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,6 +1581,13 @@ 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 ) {
Expand Down
2 changes: 1 addition & 1 deletion newspack-theme/sass/theme-description.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Version: 2.3.0
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: newspack
Expand Down
25 changes: 0 additions & 25 deletions newspack-theme/sass/variables-site/_newspack-ui.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion newspack-theme/sass/variables-site/_variables-site.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
@use "newspack-ui";
@use "structure";
@use "transitions";
30 changes: 13 additions & 17 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "newspack",
"version": "2.4.0",
"version": "2.3.0",
"description": "A theme for Newspack. https://newspack.com",
"bugs": {
"url": "https://github.com/Automattic/newspack-theme/issues"
Expand Down Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@octokit/rest": "^20.0.2",
"@rushstack/eslint-patch": "^1.10.4",
"@wordpress/browserslist-config": "^6.12.0",
"@wordpress/browserslist-config": "^6.11.0",
"chokidar-cli": "^3.0.0",
"classnames": "^2.5.1",
"cssnano": "^7.0.6",
Expand All @@ -55,7 +55,7 @@
"postcss-focus-within": "^9.0.1",
"postcss-scss": "^4.0.9",
"rtlcss": "^4.3.0",
"sass": "^1.81.0"
"sass": "^1.80.6"
},
"overrides": {
"terser-webpack-plugin": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-child-releases.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* eslint-disable no-console, @typescript-eslint/no-var-requires */
/* eslint-disable no-console */

const { basename, resolve } = require( 'path' );
const { stat, readFile } = require( 'fs-extra' );
Expand Down
Loading