Skip to content

Commit

Permalink
Merge branch 'trunk' into epic/ras-acc
Browse files Browse the repository at this point in the history
  • Loading branch information
chickenn00dle committed Sep 18, 2024
2 parents 92625ee + 45a2042 commit 2e29351
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
1 change: 0 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
* 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))

<<<<<<< HEAD
# [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
Expand Down
1 change: 0 additions & 1 deletion newspack-theme/sass/plugins/woocommerce.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1849,7 +1849,6 @@ table.woocommerce-table--order-details.shop_table,
a {
background: var(--newspack-theme-color-primary);
color: var(--newspack-theme-color-against-primary);
pointer-events: none;

&:focus-visible {
outline-color: var(--newspack-theme-color-bg-body);
Expand Down
16 changes: 8 additions & 8 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"devDependencies": {
"@octokit/rest": "^20.0.2",
"@rushstack/eslint-patch": "^1.10.4",
"@wordpress/browserslist-config": "^6.6.0",
"@wordpress/browserslist-config": "^6.7.0",
"chokidar-cli": "^3.0.0",
"classnames": "^2.5.1",
"eslint": "^8.57.0",
Expand All @@ -54,7 +54,7 @@
"postcss-focus-within": "^9.0.0",
"postcss-scss": "^4.0.9",
"rtlcss": "^4.3.0",
"sass": "^1.77.8"
"sass": "^1.78.0"
},
"overrides": {
"terser-webpack-plugin": {
Expand Down

0 comments on commit 2e29351

Please sign in to comment.