Skip to content
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

fix(staking): fix header on small screens 2: This Time It's Personal #2483

Merged
merged 1 commit into from
Mar 13, 2025
Merged

fix(staking): fix header on small screens 2: This Time It's Personal #2483

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
2 changes: 1 addition & 1 deletion apps/staking/src/components/AccountSummary/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export const AccountSummary = ({
<Image
src={background}
alt=""
className="absolute -right-40 hidden h-full object-cover object-right [mask-image:linear-gradient(to_right,_transparent,_black_50%)] md:block"
className="absolute -right-40 hidden h-full object-cover object-right [mask-image:linear-gradient(to_right,_transparent,_black_50%)] sm:block"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated change but just something I noticed looked odd, the account summary background wasn't showing up on small screens where it should have been

/>
<div className="relative flex flex-col items-start justify-between gap-8 sm:p-4 md:flex-row md:items-center md:gap-16 xl:px-8 xl:py-2">
<div>
Expand Down
4 changes: 2 additions & 2 deletions apps/staking/src/components/Header/current-stake-account.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ export const CurrentStakeAccount = ({
return api.type === ApiStateType.Loaded && !isBlocked ? (
<div
className={clsx(
"hidden flex-col items-end justify-center text-xs xs:flex xl:flex-row xl:items-center xl:text-sm",
"hidden flex-col items-end justify-center text-xs xs:flex 2xl:flex-row 2xl:items-center 2xl:text-sm",
className,
)}
{...props}
>
<div className="font-semibold">Stake account:</div>
<CopyButton
text={api.account.toBase58()}
className="text-pythpurple-400 xl:ml-2 xl:mr-0"
className="text-pythpurple-400 2xl:ml-2 2xl:mr-0"
>
<TruncatedKey>{api.account}</TruncatedKey>
</CopyButton>
Expand Down
8 changes: 4 additions & 4 deletions apps/staking/src/components/Header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const Header = ({
>
<div className="border-b border-neutral-600/50 bg-pythpurple-800 lg:border-x">
<MaxWidth className="flex h-header items-center justify-between gap-2 lg:-mx-4">
<div className="flex flex-row items-center gap-6 lg:gap-12">
<div className="flex flex-row items-center gap-6 xl:gap-12">
<Link
href="/"
className="-mx-2 h-[calc(var(--header-height)_-_0.5rem)] rounded-sm p-2 text-pythpurple-100 focus:outline-none focus-visible:ring-1 focus-visible:ring-pythpurple-400"
Expand All @@ -30,16 +30,16 @@ export const Header = ({
<Logomark className="h-full lg:hidden" />
<span className="sr-only">Pyth Staking</span>
</Link>
<Stats className="hidden gap-4 md:flex lg:gap-6" />
<Stats className="hidden gap-4 lg:flex xl:gap-6" />
</div>
<div className="flex flex-none flex-row items-stretch gap-4 lg:gap-8">
<div className="flex flex-none flex-row items-stretch gap-4 xl:gap-8">
<CurrentStakeAccount />
<WalletButton className="flex-none" />
<HelpMenu />
</div>
</MaxWidth>
</div>
</header>
<Stats className="border-b border-neutral-600/50 py-4 text-center md:hidden" />
<Stats className="border-b border-neutral-600/50 py-4 text-center lg:hidden" />
</>
);
6 changes: 3 additions & 3 deletions apps/staking/src/components/Header/stats.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const Stats = ({ className, ...props }: HTMLProps<HTMLDivElement>) => {

return (
<div className={clsx("flex flex-row items-stretch", className)} {...props}>
<div className="flex-1 md:flex-none">
<div className="flex-1 lg:flex-none">
{state.type === StateType.Loaded ? (
<Tokens className="mb-1 text-xl font-semibold leading-none">
{state.data.totalStaked}
Expand All @@ -35,7 +35,7 @@ export const Stats = ({ className, ...props }: HTMLProps<HTMLDivElement>) => {
</div>
</div>
<div className="border-l border-neutral-600/50" />
<div className="flex-1 md:flex-none">
<div className="flex-1 lg:flex-none">
{state.type === StateType.Loaded ? (
<Tokens className="mb-1 text-xl font-semibold leading-none">
{state.data.rewardsDistributed}
Expand All @@ -48,7 +48,7 @@ export const Stats = ({ className, ...props }: HTMLProps<HTMLDivElement>) => {
</div>
</div>
<div className="border-l border-neutral-600/50" />
<div className="flex-1 md:flex-none">
<div className="flex-1 lg:flex-none">
{state.type === StateType.Loaded ? (
<Tokens className="mb-1 text-xl font-semibold leading-none">
{state.data.totalGovernance}
Expand Down
2 changes: 1 addition & 1 deletion apps/staking/src/components/Root/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const Root = ({ children }: Props) => (
redHatMono.variable,
)}
>
<body className="grid min-h-dvh grid-rows-[auto_auto_1fr_auto] text-pythpurple-100 [background:radial-gradient(20rem_50rem_at_50rem_10rem,_rgba(119,_49,_234,_0.20)_0%,_rgba(17,_15,_35,_0.00)_100rem),_#0A0814] selection:bg-pythpurple-600/60">
<body className="grid min-h-dvh grid-rows-[auto_auto_auto_1fr_auto] text-pythpurple-100 [background:radial-gradient(20rem_50rem_at_50rem_10rem,_rgba(119,_49,_234,_0.20)_0%,_rgba(17,_15,_35,_0.00)_100rem),_#0A0814] selection:bg-pythpurple-600/60 lg:grid-rows-[auto_auto_1fr_auto]">
<Header className="z-10" />
<RestrictedRegionBanner />
<MaxWidth className="z-0 min-h-[calc(100dvh_-_var(--header-height))] py-4 sm:min-h-0">
Expand Down
2 changes: 1 addition & 1 deletion apps/staking/src/components/WalletButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ const ButtonComponent = ({
...props
}: ButtonComponentProps) => (
<Button
className={clsx("w-36 text-sm lg:w-52 lg:text-base", className)}
className={clsx("w-36 text-sm lg:text-base xl:w-52", className)}
size="nopad"
{...props}
>
Expand Down
Loading