Skip to content

Card header: inline upgrade toggle, matched cost pill heights #815

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.

Sign up for GitHub

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

Merged
ptrlrd merged 1 commit into from
Jul 31, 2026
Merged

Card header: inline upgrade toggle, matched cost pill heights #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions frontend/app/card-revamp.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@
.card-rvmp .hero h1 { font-family: var(--serif); font-weight: 600; font-size: clamp(32px, 5vw, 50px);
line-height: 1.04; margin: 12px 0 0; text-wrap: balance; color: var(--text); }
.card-rvmp .hero h1 .up { color: var(--good); }
/* Title row: the Normal/Upgraded toggle sits inline with the name, middle
aligned, and wraps under it on narrow screens. */
.card-rvmp .hero-head { display: flex; align-items: center; gap: 8px 16px; flex-wrap: wrap; margin-top: 12px; }
.card-rvmp .hero-head h1 { margin: 0; }
.card-rvmp .hero-seg { flex: none; }
.card-rvmp .hero-seg .segbtn { flex: none; padding: 7px 14px; }
/* The star span's ★ falls back to a system font with a taller line box than
the digits around it; pin the line height so the row stays even. */
.card-rvmp .eyebrow span { line-height: 1.2; }
.card-rvmp .lede { color: var(--text-2); font-size: 18px; margin: 14px 0 0; max-width: 60ch; }
/* Programmatic overview prose rendered as a hero lead (EntityProse lead mode).
Sits under the H1 in place of the old token-stripped description lede. */
Expand Down
50 changes: 26 additions & 24 deletions frontend/app/cards/[id]/CardDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,10 +412,30 @@ export default function CardDetail({ initialCard, initialEnchantments, initialSt
</>
)}
</p>
<h1>
{card.name}
{isUpgraded && <span className="up">+</span>}
</h1>
<div className="hero-head">
<h1>
{card.name}
{isUpgraded && <span className="up">+</span>}
</h1>
{hasUpgrade && (
<div className="seg hero-seg" role="group" aria-label={t("Card version", lang)}>
<button
type="button"
className={`segbtn${!upgraded ? " on" : ""}`}
onClick={() => setUpgraded(false)}
>
{t("Normal", lang)}
</button>
<button
type="button"
className={`segbtn${upgraded ? " on" : ""}`}
onClick={() => setUpgraded(true)}
>
{t("Upgraded", lang)}
</button>
</div>
)}
</div>
{/* Overview prose as the hero lead (replaces the old token-stripped
description lede, which rendered blanks like "Gain ."). */}
<EntityProse kind="card" card={card} lead />
Expand Down Expand Up @@ -709,27 +729,9 @@ export default function CardDetail({ initialCard, initialEnchantments, initialSt
}}
/>

{/* Variant switcher */}
{/* Variant switcher (the Normal/Upgraded toggle sits in the hero,
inline with the card name) */}
<div className="variant">
{hasUpgrade && (
<div className="seg" role="group" aria-label={t("Card version", lang)}>
<button
type="button"
className={`segbtn${!upgraded ? " on" : ""}`}
onClick={() => setUpgraded(false)}
>
{t("Normal", lang)}
</button>
<button
type="button"
className={`segbtn${upgraded ? " on" : ""}`}
onClick={() => setUpgraded(true)}
>
{t("Upgraded", lang)}
</button>
</div>
)}

{cardEnchantments.length > 0 && (
<select
className="ench-select"
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/components/CardGrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function CardItem({ card }: { card: Card }) {
{card.is_x_cost ? "X" : display.cost != null && display.cost < 0 ? "U" : display.cost}
</span>
{(card.star_cost != null || card.is_x_star_cost) && (
<span className="inline-flex items-center gap-0.5 px-1.5 py-0.5 rounded-full bg-[var(--bg-primary)] border border-amber-700/40 text-xs font-bold text-amber-300">
<span className="inline-flex items-center gap-0.5 h-7 px-2 rounded-full bg-[var(--bg-primary)] border border-amber-700/40 text-sm font-bold text-amber-300">
{card.is_x_star_cost ? "X" : card.star_cost}
<img src={imageUrl("/static/images/icons/star_icon.webp")}
alt="star" className="w-3.5 h-3.5" crossOrigin="anonymous" />
Expand Down
Loading