This repository was archived by the owner on Feb 23, 2024. It is now read-only.
Fix MD lint errors and fix conflicts #6598
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Gutenberg uses two different attributes for text colors: * `style.color.text`, and * `textColor` However, the second one is used only when a color from the default palette is selected AND the post is saved and reloaded. With this fix we use the human readable string from the default palette as a CSS variable. Please note that while Gutenberg correctly assigns the appropriate CSS class to render the right color, the problem is that if the color is handled by a class, it can be overridden for example by themes. See #6492
gigitux
added
skip-changelog
rubikuserbot
requested review from
a team and
dinhtungdu
and removed request for
a team
gigitux
force-pushed
the
fix/merge-release-7.8.2-trunk
branch
from
ecdd99f to
09c2b02
Compare
Contributor
|
Size Change: 0 B Total Size: 866 kB ℹ️ View Unchanged
|
dinhtungdu
approved these changes
Jun 20, 2022
Member
dinhtungdu
left a comment
dinhtungdu
left a comment
There was a problem hiding this comment.
Left a minor comment but this is LGTM already so pre-approving.
| "@types/dinero.js": "1.9.0", | ||
| "@types/gtag.js": "0.0.10", | ||
| "@types/jest": "27.4.1", | ||
| "@types/jest-environment-puppeteer": "5.0.2", |
Member
There was a problem hiding this comment.
Was this moved up by a mistake? The dependency was already sorted correctly.
Contributor
Author
There was a problem hiding this comment.
To be honest, I didn't touch the file. I fixed it :)
* Fix PHP notice in Mini Cart when prices included taxes (#6537) * Empty commit for release pull request * Add changelog to readme.txt * Update versions * Add Testing steps for version 7.8.1 * Bumping version strings to new version. * Empty commit for release pull request * Empty commit for release pull request * Replace instances of wp_is_block_theme() with wc_current_theme_is_fse_theme() (#6590) * update changelog and testing instructions * Empty commit for release pull request * upload zip * Bumping version strings to new version. * Fix images hidden by default in Product grid blocks (#6599) * update changelog and testing instructons * Bumping version strings to new version. Co-authored-by: Albert Juhé Lluveras <[email protected]> Co-authored-by: github-actions <[email protected]> Co-authored-by: Luigi <[email protected]>
…ocks into fix/merge-release-7.8.2-trunk
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR:
merges release 7.8.2 code in trunk. I resolved a conflict on the file assets/js/blocks/featured-items/with-featured-item.tsx Maybe @frontdevde or @sunyatasattva, could you check if I resolved it in the right way?The problem was only how was formatted the code. Resolved 👍Testing
User Facing Testing
Check out this branch
npm run lint:md:docsdoesn't return any errors (you can check the CI job too),WooCommerce Visibility
Performance Impact
Changelog