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

[FE](fix): tablet #88

Merged
merged 1 commit into from
Apr 3, 2024
Merged

[FE](fix): tablet #88

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
4 changes: 2 additions & 2 deletions client/src/containers/panel/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export default function Panel({ children }: { children: React.ReactNode }) {
className={cn({
'rounded-4xl bg-background after:rounded-b-4xl before:rounded-t-4xl absolute bottom-0 top-0 z-10 my-2 flex w-full max-w-[342px] flex-col shadow-md transition-transform duration-500 before:absolute before:left-0 before:top-1 before:h-6 before:w-full before:bg-gradient-to-b before:from-white/100 before:to-white/0 before:content-[""] after:absolute after:bottom-1 after:left-0 after:h-6 after:w-full after:bg-gradient-to-t after:from-white/0 after:to-white/100 after:content-[""] xl:max-w-[400px]':
true,
'left-[92px] translate-x-0 xl:left-[106px]': open,
'left-20 -translate-x-full xl:left-24': !open,
'left-20 translate-x-0 xl:left-[106px]': open,
'left-[70px] -translate-x-full xl:left-24': !open,
})}
>
<div
Expand Down
10 changes: 5 additions & 5 deletions client/src/containers/sidebar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ export default function Sidebar() {
const [sidebarTab, setSidebarTab] = useState<'projects' | 'countries' | 'datasets'>('projects');

return (
<div className="rounded-8xl absolute bottom-0 left-4 top-0 z-20 my-2 w-16 bg-yellow-700 py-10 text-xs text-yellow-50 xl:w-20">
<div className="rounded-8xl absolute bottom-0 left-2 top-0 z-20 my-2 w-16 bg-yellow-700 py-10 text-xs text-yellow-50 xl:left-4 xl:w-20">
<div className="h-[88%]">
<div className="flex hidden flex-col items-center pb-12 xl:block">
<Image src="/images/logo.svg" alt="logo" width={35} height={29} />
<div className="mx-2 flex hidden items-center pb-12 xl:block">
<Image src="/images/logo.svg" alt="logo" width={60} height={29} />
</div>

<div className="block flex flex-col items-center pb-12 xl:hidden">
<div className="mx-2 block flex items-center pb-12 xl:hidden">
<Image src="/images/logo.svg" alt="logo" width={48} height={19} />
</div>

Expand All @@ -42,7 +42,7 @@ export default function Sidebar() {
key={name}
data-cy={`sidebar-tab-${name}`}
className={cn({
'xl:rounded-8xl mx-2 mt-2 flex flex-col items-center space-y-1 rounded-full border-2 border-transparent py-2 text-center hover:border-yellow-50 xl:py-10':
'xl:rounded-8xl mx-auto mt-2 flex h-12 w-12 flex-col items-center justify-center space-y-1 rounded-full border-2 border-transparent text-center hover:border-yellow-50 xl:mx-2 xl:h-32 xl:w-auto xl:py-10 xl:py-2':
true,
'bg-yellow-600': pathname.includes(name),
})}
Expand Down
Loading