Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

bug: Fix inconsistent border radius on left panel (#1067)

JEM51dd1d918bab
diff --git a/apps/web/src/app/[locale]/challenge/[slug]/left-wrapper.tsx b/apps/web/src/app/[locale]/challenge/[slug]/left-wrapper.tsx
index e927566e..013befd5 100644
--- a/apps/web/src/app/[locale]/challenge/[slug]/left-wrapper.tsx
+++ b/apps/web/src/app/[locale]/challenge/[slug]/left-wrapper.tsx
@@ -116,7 +116,7 @@ export function LeftWrapper({ children, challenge, track, expandPanel, isDesktop
>
<TabsList
className={cn(
- 'bg-background/90 dark:bg-muted/90 sticky top-0 z-10 grid h-auto w-full rounded-none rounded-tl-2xl rounded-tr-xl border-b border-zinc-300 backdrop-blur-sm dark:border-zinc-700',
+ 'bg-background/90 dark:bg-muted/90 sticky top-0 z-10 grid h-auto w-full border-b border-zinc-300 backdrop-blur-sm dark:border-zinc-700',
{
'grid-rows-3 gap-2': isIconOnly,
'grid-cols-3 gap-0.5': !isIconOnly,
@@ -158,7 +158,11 @@ export function LeftWrapper({ children, challenge, track, expandPanel, isDesktop
<TabsTrigger
className={cn(
'rounded-md rounded-tr-lg duration-300 hover:bg-neutral-200/50 data-[state=active]:bg-neutral-200 dark:hover:bg-neutral-700/50 dark:data-[state=active]:bg-neutral-700',
- { 'p-4': isIconOnly },
+ {
+ 'p-4': isIconOnly,
+ 'rounded-tr-xl': !isTrackVisible,
+ 'rounded-br-xl': isCollapsed && !isDesktop,
+ },
)}
onClick={() => {
router.push(`/challenge/${challenge.slug}/submissions`);
diff --git a/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx b/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx
index d9ec8a44..504abda2 100644
--- a/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx
+++ b/apps/web/src/app/[locale]/challenge/_components/challenge-layout.tsx
@@ -288,7 +288,7 @@ export function ChallengeLayout({
style={{ height: fssettings.isFullscreen ? '100vh' : 'calc(100vh - 3.5rem)' }}
>
<div
- className={`w-full overflow-hidden rounded-l-2xl rounded-r-xl border-zinc-300 bg-white dark:border-zinc-700 dark:bg-zinc-800 ${
+ className={`w-full overflow-hidden rounded-2xl border-zinc-300 bg-white dark:border-zinc-700 dark:bg-zinc-800 ${
!isPlayground && 'border'
}`}
ref={leftSide}
@@ -307,7 +307,7 @@ export function ChallengeLayout({
<div className="group-hover:bg-primary group-active:bg-primary group-hover:dark:bg-primary absolute left-1/2 top-1/2 h-1 w-24 -translate-x-1/2 -translate-y-1/2 rounded-full bg-neutral-400 duration-300 group-active:duration-75 dark:bg-neutral-700 lg:h-24 lg:w-1" />
</div>
<div
- className="flex min-h-[90px] w-full flex-1 flex-grow flex-col overflow-hidden rounded-l-xl rounded-r-2xl border border-zinc-300 dark:border-zinc-700 lg:min-w-[500px]"
+ className="flex min-h-[90px] w-full flex-1 flex-grow flex-col overflow-hidden rounded-2xl border border-zinc-300 dark:border-zinc-700 lg:min-w-[500px]"
ref={rightSide}
>
{right}