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

Jump to bottom

Backer #3503

Merged
merged 3 commits into from
Jun 20, 2024
Merged

Backer #3503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a44022
clients/feed: polish layout
emilwidlund Jun 20, 2024
c994497
clients/feed: adjust top margin
emilwidlund Jun 20, 2024
e99d650
clients/feed: flex-shrink-0
emilwidlund Jun 20, 2024
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 clients/apps/web/src/app/(topbar)/(backer)/(sidebar)/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function Layout({ children }: PropsWithChildren) {

return (
<div className="flex h-full flex-col gap-12 md:flex-row">
<div className="flex h-full w-full flex-col gap-y-6 self-stretch md:sticky md:top-[6.5rem] md:max-w-xs">
<div className="flex h-full w-full flex-shrink-0 flex-col gap-y-6 self-stretch md:sticky md:top-[3rem] md:max-w-xs">
<PurchaseSidebar />
{shouldShowGitHubAuthUpsell ? (
<GitHubAuthUpsell />
Expand Down
2 changes: 1 addition & 1 deletion clients/apps/web/src/app/(topbar)/(backer)/purchases/products/ClientPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default function ClientPage() {

return (
<div className="flex h-full flex-col gap-12 md:flex-row">
<div className="flex h-full w-full flex-col gap-y-12 self-stretch md:sticky md:top-[6.5rem] md:max-w-xs">
<div className="flex h-full w-full flex-shrink-0 flex-col gap-y-12 self-stretch md:sticky md:top-[3rem] md:max-w-xs">
<PurchaseSidebar />
</div>
{orders?.pagination.total_count === 0 ? (
Expand Down
2 changes: 1 addition & 1 deletion clients/apps/web/src/app/(topbar)/(backer)/purchases/subscriptions/ClientPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function ClientPage() {

return (
<div className="flex h-full flex-col gap-12 md:flex-row">
<div className="flex h-full w-full flex-col gap-y-12 self-stretch md:sticky md:top-[6.5rem] md:max-w-xs">
<div className="flex h-full w-full flex-shrink-0 flex-col gap-y-12 self-stretch md:sticky md:top-[3rem] md:max-w-xs">
<PurchaseSidebar>
<div className="flex items-center space-x-2">
<Checkbox
Expand Down
18 changes: 9 additions & 9 deletions clients/apps/web/src/components/Dashboard/navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,15 +310,6 @@ const backerRoutesList = (): Route[] => [
if: true,
subs: undefined,
},
{
id: 'funding',
title: 'Funding',
link: `/funding`,
icon: <FavoriteBorderOutlined className="h-5 w-5" fontSize="inherit" />,
postIcon: undefined,
if: true,
subs: undefined,
},
{
id: 'purchases',
title: 'Purchases',
Expand All @@ -330,6 +321,15 @@ const backerRoutesList = (): Route[] => [
},
subs: undefined,
},
{
id: 'funding',
title: 'Funded Issues',
link: `/funding`,
icon: <HowToVoteOutlined className="h-5 w-5" fontSize="inherit" />,
postIcon: undefined,
if: true,
subs: undefined,
},
]

const personalFinanceSubRoutesList = (): SubRoute[] => [
Expand Down
2 changes: 1 addition & 1 deletion clients/apps/web/src/components/Purchases/PurchasesSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const PurchaseLink = ({ ...props }: PropsWithChildren<LinkProps>) => {
return (
<Link
className={twMerge(
'flex cursor-pointer flex-row items-center justify-between gap-x-2 rounded-xl bg-transparent px-4 py-2 text-sm text-gray-500 transition-colors hover:text-blue-500 dark:hover:text-blue-50',
'flex cursor-pointer flex-row items-center justify-between gap-x-2 rounded-xl bg-transparent px-4 py-2 text-sm text-gray-500 transition-colors [font-feature-settings:"tnum"] hover:text-blue-500 dark:hover:text-blue-50',
active
? 'dark:bg-polar-700 bg-blue-50 text-blue-500 dark:text-blue-50'
: '',
Expand Down
Loading