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

Alpha release Nov 29 #2419

Merged
merged 9 commits into from
Nov 29, 2024
Merged

Alpha release Nov 29 #2419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b32c768
chore(deps-dev): bump @wordpress/browserslist-config
dependabot[bot] Nov 18, 2024
c410672
chore(deps-dev): bump sass from 1.80.6 to 1.81.0
dependabot[bot] Nov 18, 2024
423fe31
chore(release): merge in release v2.2.1
matticbot Nov 19, 2024
16a33aa
feat: add Bluesky to the Social Links menu (#2412)
laurelfulford Nov 20, 2024
ad87037
chore: remove dependabot pulls from changelog workflow (#2414)
leogermani Nov 20, 2024
6651f67
feat: add Bluesky to the profile fields (#2413)
leogermani Nov 21, 2024
71d3db2
chore(release): merge in release v2.3.0
matticbot Nov 25, 2024
da4efd9
fix: remove translation workaround; the issue is fixed in WP (#2415)
laurelfulford Nov 27, 2024
4488d59
feat: merge RAS-ACC work into trunk (#2417)
laurelfulford Nov 28, 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'
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
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'
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
Expand All @@ -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.

Expand Down
173 changes: 165 additions & 8 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.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
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.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
Expand Down
4 changes: 4 additions & 0 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,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
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.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
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.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
Expand Down
6 changes: 1 addition & 5 deletions newspack-theme/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' );
Expand Down
7 changes: 0 additions & 7 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,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 ) {
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.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
Expand Down
25 changes: 25 additions & 0 deletions newspack-theme/sass/variables-site/_newspack-ui.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}
}
1 change: 1 addition & 0 deletions newspack-theme/sass/variables-site/_variables-site.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@use "newspack-ui";
@use "structure";
@use "transitions";
30 changes: 17 additions & 13 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.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"
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
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 */
/* eslint-disable no-console, @typescript-eslint/no-var-requires */

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