Skip to content

Merge release/26.8 into trunk#25461

Merged
crazytonyli merged 8 commits into
trunkfrom
merge/release-26.8-into-trunk
Mar 26, 2026
Merged

Merge release/26.8 into trunk#25461
crazytonyli merged 8 commits into
trunkfrom
merge/release-26.8-into-trunk

Conversation

@wpmobilebot
Copy link
Copy Markdown
Contributor

Merging release/26.8 into trunk.

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

                            release/26.8  ----o-- - - -
                                               \
           merge/release-26.8-into-trunk        `---.
                                                     \
                                   trunk  ------------x- - -

@wpmobilebot wpmobilebot added this to the 26.9 milestone Mar 26, 2026
@dangermattic
Copy link
Copy Markdown
Collaborator

1 Message
📖 This PR has the Releases label: some checks will be skipped.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Copy Markdown
Contributor Author

wpmobilebot commented Mar 26, 2026

App Icon📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress
ConfigurationRelease-Alpha
Build Number31814
VersionPR #25461
Bundle IDorg.wordpress.alpha
Commit9b35a68
Installation URL6maiq8id2hiu0
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@wpmobilebot
Copy link
Copy Markdown
Contributor Author

wpmobilebot commented Mar 26, 2026

App Icon📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack
ConfigurationRelease-Alpha
Build Number31814
VersionPR #25461
Bundle IDcom.jetpack.alpha
Commit9b35a68
Installation URL4fr4hn5q3oqq8
Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

@crazytonyli crazytonyli force-pushed the merge/release-26.8-into-trunk branch from be38ad4 to 9b35a68 Compare March 26, 2026 22:36
@crazytonyli
Copy link
Copy Markdown
Contributor

@kean There is a conflict in the Reader.css file, which is modified in both #25456 and the trunk branch. I discarded the changes in #25456 and kept the trunk version. Please feel free to update this PR if the conflict resolution was incorrect.

@sonarqubecloud
Copy link
Copy Markdown

@crazytonyli crazytonyli enabled auto-merge March 26, 2026 22:39
@crazytonyli
Copy link
Copy Markdown
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!

@kean
Copy link
Copy Markdown
Contributor

kean commented Mar 26, 2026

Thanks for the heads up. I'll review the code in trunk once it merges to ensure everything is still in place.

@crazytonyli
Copy link
Copy Markdown
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))

@crazytonyli crazytonyli added this pull request to the merge queue Mar 26, 2026
Merged via the queue into trunk with commit fa4a331 Mar 26, 2026
27 checks passed
@crazytonyli crazytonyli deleted the merge/release-26.8-into-trunk branch March 26, 2026 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants