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.

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

feat: merge RAS-ACC work into trunk #2417

Merged
merged 54 commits into from
Nov 28, 2024
Merged

feat: merge RAS-ACC work into trunk #2417

merged 54 commits into from
Nov 28, 2024

Conversation

laurelfulford
Copy link
Contributor

@laurelfulford laurelfulford commented Nov 27, 2024

All Submissions:

Changes proposed in this Pull Request:

This PR merges the theme changes for RAS-ACC into trunk.

For the theme, the changes were CSS to make sure the theme's font sizing didn't interfere with the Newspack UI font sizing. These are contained changes (the variables from Newspack UI are redefined in the theme and adjusted for the base 20px font size), so they won't affect anything outside of RAS-ACC.

How to test the changes in this Pull Request:

  1. Apply this and other PRs related to RAS-ACC (there should be a plugin, newsletters, and blocks one)
  2. When logged in, append ?ui-demo to any page -- this should add demo content to the bottom of the page.
  3. Spot-check the font sizes -- particularly the headings -- against the pixel sizes listed here to make sure they match.

Other information:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
  • Have you written new tests for your changes, as applicable?
  • Have you successfully ran tests with your changes locally?

semantic-release-bot and others added 30 commits May 16, 2024 18:52
## [1.88.1-epic-ras-acc.1](v1.88.0...v1.88.1-epic-ras-acc.1) (2024-05-16)

### Bug Fixes

* **homepage-posts:** handle "time ago" format in HBP ([e4e8af5](e4e8af5))
feat(ras-acc): update Newspack UI variable font sizes for the theme
# [1.89.0-epic-ras-acc.1](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](63307ae))
* update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
# [1.89.0-epic-ras-acc.2](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](3d30e62))
* handle attachement fetch failure ([#2301](#2301)) ([6bdffe0](6bdffe0))

### Features

* add specific css for subscribe pattern 5 and 6 ([#2305](#2305)) ([f7cf899](f7cf899))
# [1.91.0-epic-ras-acc.1](v1.90.3...v1.91.0-epic-ras-acc.1) (2024-07-03)

### Features

* add support for publisher media kit ([#2317](#2317)) ([4430264](4430264))
* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae))
* update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
Left some merge conflict markup while merging trunk 🙇

This PR cleans it up!
# [1.91.0-epic-ras-acc.2](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](#2335)) ([080e0fc](080e0fc))
# [1.91.0-epic-ras-acc.3](v1.91.0-epic-ras-acc.2...v1.91.0-epic-ras-acc.3) (2024-07-10)

### Bug Fixes

* correct subtitle order for WP 6.6 ([#2341](#2341)) ([e75fa8e](e75fa8e))
# [1.92.0-epic-ras-acc.1](v1.91.0...v1.92.0-epic-ras-acc.1) (2024-07-17)

### Bug Fixes

* **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc))

### Features

* add newspack-block-theme backwards compatibility ([#2315](#2315)) ([0e60c3a](0e60c3a))
* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae))
* update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
This PR removes some checkout specific styles that are impacting the credit card image alignment for some payment gateways
# [1.92.0-epic-ras-acc.2](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](#2350)) ([1f48f20](1f48f20))
# [1.93.0-epic-ras-acc.1](v1.92.0...v1.93.0-epic-ras-acc.1) (2024-07-31)

### Bug Fixes

* **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc))
* **ras-acc:** remove redundant checkout styles ([#2350](#2350)) ([1f48f20](1f48f20))

### Features

* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae))
* update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
fix(ras-acc): merge trunk into epic/ras-acc
# [2.0.0-epic-ras-acc.1](v1.93.0-epic-ras-acc.1...v2.0.0-epic-ras-acc.1) (2024-08-09)

### Bug Fixes

* correct linting errors ([d3b74c7](d3b74c7))
* correct more linting errors ([593c246](593c246))
* update dependencies to support `@wordpress/scripts` ([#2318](#2318)) ([1ee216c](1ee216c))

### BREAKING CHANGES

* Updates dependencies for compatibility with WordPress 6.6.*, but breaks JS in WordPress 6.5.* and below. If you need support for WP 6.5.*, please do not upgrade to this new major version.

* chore: refactor for newspack-scripts dependency updates

* refactor: use proxy script for eslint and stylelint scripts

* chore: update newspack-scripts to v5.6.0-alpha.3

* fix: actually update newspack-scripts to v5.6.0-alpha.3

* chore: update newspack-scripts to v5.6.0-alpha.4

* fix: semantic-release script

* fix: add missing Prettier config files

* chore: update newspack-scripts to 5.6.0-alpha.5

* chore: update newspack-scripts to v5.6.0-alpha.7

* fix: reformat SCSS

* chore: update newspack-scripts to v5.6.0-alpha.8

* fix: broken composer lockfile

* chore: bump newspack-scripts to v5.5.2
# [2.1.0-epic-ras-acc.4](v2.1.0-epic-ras-acc.3...v2.1.0-epic-ras-acc.4) (2024-10-10)

### Features

* add disabled styles ([#2386](#2386)) ([2f4d5a7](2f4d5a7))
# [2.3.0-epic-ras-acc.1](v2.2.0...v2.3.0-epic-ras-acc.1) (2024-11-12)

### Bug Fixes

* correct linting errors ([d3b74c7](d3b74c7))
* correct more linting errors ([593c246](593c246))
* **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc))
* **ras-acc:** remove redundant checkout styles ([#2350](#2350)) ([1f48f20](1f48f20))

### Features

* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae))
* update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
# [2.3.0-epic-ras-acc.2](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](#2411)) ([110b039](110b039))
# [2.4.0-epic-ras-acc.1](v2.3.0...v2.4.0-epic-ras-acc.1) (2024-11-26)

### Bug Fixes

* correct linting errors ([d3b74c7](d3b74c7))
* correct more linting errors ([593c246](593c246))
* **ras-acc:** clean up merge conflict marker ([#2335](#2335)) ([080e0fc](080e0fc))
* **ras-acc:** remove redundant checkout styles ([#2350](#2350)) ([1f48f20](1f48f20))

### Features

* update clamp calculations based on viewport range of 782 - 1280 ([63307ae](63307ae))
* update Newspack UI variable font sizes for the theme ([212e2fd](212e2fd))
@github-actions github-actions bot added [Status] Approved The pull request has been reviewed and is ready to merge and removed [Status] Needs Review The issue or pull request needs to be reviewed labels Nov 28, 2024
@laurelfulford laurelfulford merged commit 4488d59 into trunk Nov 28, 2024
5 checks passed
@laurelfulford laurelfulford deleted the feat/merge-ras-acc branch November 28, 2024 18:40
Copy link

Hey @laurelfulford, good job getting this PR merged! 🎉

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

Please check if this PR needs to be included in the "Upcoming Changes" and "Release Notes" doc. If it doesn't, simply remove the label.

If it does, please add an entry to our shared document, with screenshots and testing instructions if applicable, then remove the label.

Thank you! ❤️

matticbot pushed a commit that referenced this pull request Nov 29, 2024
# [2.4.0-alpha.1](v2.3.0...v2.4.0-alpha.1) (2024-11-29)

### Bug Fixes

* remove translation workaround; the issue is fixed in WP ([#2415](#2415)) ([da4efd9](da4efd9))

### Features

* add Bluesky to the profile fields ([#2413](#2413)) ([6651f67](6651f67))
* add Bluesky to the Social Links menu ([#2412](#2412)) ([16a33aa](16a33aa))
* merge RAS-ACC work into trunk ([#2417](#2417)) ([4488d59](4488d59))
@matticbot
Copy link
Contributor

🎉 This PR is included in version 2.4.0-alpha.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
released on @alpha [Status] Approved The pull request has been reviewed and is ready to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants