Skip to content

Commit

Permalink
Revert "fix: Feed page responsiveness (open-sauced#1490)"
Browse files Browse the repository at this point in the history
This reverts commit 67662b2.
  • Loading branch information
babblebey authored Aug 7, 2023
1 parent f8f1d49 commit c64ca7b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions components/atoms/UserCard/user-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ const UserCard = ({ username, name, meta, loading }: UserCardProps) => {
const avatarUrl = getAvatarByUsername(username);

return (
<div className="pb-6 border bg-light-slate-1 w-max rounded-xl border-zinc-200">
<div className="w-full pb-6 border rounded-lg bg-light-slate-1 border-zinc-200">
{loading ? (
<div className="flex items-center justify-center h-32 w-72">
<Spinner className="mt-6 " />
</div>
) : (
<div className="flex flex-col items-center gap-6 px-9">
<div className="flex flex-col items-center gap-6 px-6 ">
<div className="flex flex-col items-center gap-2 -mt-10">
<Image
className="border border-white rounded-full "
Expand Down
4 changes: 1 addition & 3 deletions layouts/profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ const ProfileLayout = ({ children }: { children: React.ReactNode }) => {
<div className="flex flex-col min-h-screen">
<TopNav />
<div className="page-container flex grow flex-col items-center">
<main className="container px-2 flex md:px-16 pb-16 w-full flex-1 flex-col items-center bg-light-slate-2">
{children}
</main>
<main className="flex pb-16 w-full flex-1 flex-col items-center bg-light-slate-2">{children}</main>
</div>
<Footer />
</div>
Expand Down
13 changes: 8 additions & 5 deletions pages/feed/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,13 @@ const Feeds: WithPageLayout<HighlightSSRProps> = (props: HighlightSSRProps) => {
image={ogImage}
twitterCard="summary_large_image"
/>
<div className="w-full gap-[2rem] justify-center flex flex-col md:gap-6 xl:gap-16 pt-12 md:flex-row" ref={topRef}>
<div className="flex-col flex-1 xl:flex hidden gap-6 mt-12">
<div
className="container flex flex-col gap-16 px-2 pt-12 mx-auto md:px-16 lg:justify-end md:flex-row"
ref={topRef}
>
<div className="flex-col flex-1 hidden gap-6 mt-12 md:flex">
{user && (
<div className="md:w-1/2 lg:w-1/3">
<div>
<UserCard
loading={loggedInUserLoading}
username={loggedInUser?.login as string}
Expand Down Expand Up @@ -219,7 +222,7 @@ const Feeds: WithPageLayout<HighlightSSRProps> = (props: HighlightSSRProps) => {
setActiveTab(value as activeTabType);
}}
defaultValue="home"
className="grow"
className="md:flex-[2] "
>
<TabsList className={clsx("justify-start w-full border-b", !user && "hidden")}>
<TabsTrigger
Expand Down Expand Up @@ -281,7 +284,7 @@ const Feeds: WithPageLayout<HighlightSSRProps> = (props: HighlightSSRProps) => {
<FollowingHighlightWrapper selectedFilter={selectedRepo} emojis={emojis} />
</TabsContent>
</Tabs>
<div className="md:hidden gap-6 mt-10 md:flex-1 lg:flex md:flex-col">
<div className="hidden gap-6 mt-10 md:flex-1 md:flex md:flex-col">
{repoList && repoList.length > 0 && (
<HighlightsFilterCard
selectedFilter={selectedRepo}
Expand Down

0 comments on commit c64ca7b

Please sign in to comment.