webview: restore the card-hero skill detail, reverted by #196 - #206
Merged
Conversation
…CoreTeam#196 My fault, found while rebasing the open branches onto the merge batch: when IQCoreTeam#196 was rebased over the card-hero redesign, the SkillDetailView conflict got resolved to the branch's side instead of main's, so the merged PR silently reverted the whole card-hero layout back to the old zinc detail (plus stale an-cta-float edits whose pinned CTA the redesign had removed). This restores the file to exactly the 85b1571 version. Audited the rest of the batch the same way: the community tab restyle, the SD card art, the nav dock, and the market screens all carry the intended content; SkillDetailView was the only casualty. IQCoreTeam#198 and IQCoreTeam#205 rebase on top of this restore.
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
2 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.
Caught while rebasing #198 and #205 onto the merge batch, and it is my mistake to own: when #196 was rebased over the card-hero redesign (85b1571), the SkillDetailView conflict got resolved to the branch's side instead of main's, so the merged PR silently reverted the whole card-hero layout back to the old zinc detail view (plus stale an-cta-float edits whose pinned CTA the redesign had removed). Sorry about that; conflict direction on a rebase is exactly the kind of thing I should have double checked before it reached you.
This restores the file to exactly the 85b1571 version, byte for byte. Build green, tsc clean.
I audited the rest of the batch for the same failure mode: the community tab restyle (>BLOG / >AGENT_REVIEWS), the SD card art, the nav dock, and the market screens all carry the intended merged content. SkillDetailView was the only casualty.
#198 and #205 will be rebased on top of this restore so their diffs read against the correct file.