Merge release/26.8 into trunk#25461
Merged
Merged
Conversation
Collaborator
Generated by 🚫 Danger |
Contributor
Author
|
| App Name | WordPress | |
| Configuration | Release-Alpha | |
| Build Number | 31814 | |
| Version | PR #25461 | |
| Bundle ID | org.wordpress.alpha | |
| Commit | 9b35a68 | |
| Installation URL | 6maiq8id2hiu0 |
Contributor
Author
|
| App Name | Jetpack | |
| Configuration | Release-Alpha | |
| Build Number | 31814 | |
| Version | PR #25461 | |
| Bundle ID | com.jetpack.alpha | |
| Commit | 9b35a68 | |
| Installation URL | 4fr4hn5q3oqq8 |
Introduced in #25454, and caused trouble in the release process: > Inconsistencies found between 'en' and 'zh-Hant': > `addSite.selfHosted.loadingSiteInfoFailure` expected placeholders for [String] but found [] instead.
be38ad4 to
9b35a68
Compare
Contributor
crazytonyli
approved these changes
Mar 26, 2026
|
Contributor
|
@kean Actually, I'll merge this PR to keep the release process going. Feel free to create a follow-up PR to address the conflict resolution if needed. Thanks! |
Contributor
|
Thanks for the heads up. I'll review the code in |
Contributor
|
BTW, here is the diff <<<<<<< HEAD
/* workaround for CMM-1964 */
.reader-full-post .reader-full-post__story-content {
a {
color: var(--main-link-color);
}
}
.reader-full-post__story-content .wp-block-button {
a {
color: var(--color-text);
font-weight: 500;
font-size: 1rem;
text-decoration: none;
}
border-radius: 8px;
}
||||||| parent of 26c29afd0a (Fix colors in post inline comment section (#25456))
=======
/* workaround for CMM-1964 */
@media (prefers-color-scheme: dark) {
.reader-full-post.reader-full-post__story-content a {
color: var(--main-link-color);
}
}
.reader-full-post__story-content .wp-block-button {
a {
color: var(--color-text);
font-weight: 500;
font-size: 1rem;
text-decoration: none;
}
border-radius: 8px;
}
>>>>>>> 26c29afd0a (Fix colors in post inline comment section (#25456)) |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.





Merging
release/26.8intotrunk.Via intermediate branch
merge/release-26.8-into-trunk, to help fix conflicts if any: