From 27a5002c74b6f4fb6f2aeb34de205a16ba98dc7c Mon Sep 17 00:00:00 2001
From: Kyle Pope <kyle.a.pope@outlook.com>
Date: Wed, 11 Mar 2026 22:07:59 +0800
Subject: [PATCH] =?UTF-8?q?Fix=20Upcoming=20card=20height=20=E2=80=94=20us?=
 =?UTF-8?q?e=20natural=20height=20with=20scroll=20cap?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The flex-col h-full layout caused the card to stretch to match the
grid row, pushing content beyond the ScrollArea max-height. Switched
to natural card height with max-h-[400px] on ScrollArea so the card
stays compact and scrolls internally without mismatching the right
column cards.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 frontend/src/components/dashboard/UpcomingWidget.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/dashboard/UpcomingWidget.tsx b/frontend/src/components/dashboard/UpcomingWidget.tsx
index 9f26f45..a60737d 100644
--- a/frontend/src/components/dashboard/UpcomingWidget.tsx
+++ b/frontend/src/components/dashboard/UpcomingWidget.tsx
@@ -174,7 +174,7 @@ export default function UpcomingWidget({ items }: UpcomingWidgetProps) {
   const dayEntries = Array.from(grouped.entries());
 
   return (
-    <Card className="flex flex-col h-full">
+    <Card className="h-full">
       <CardHeader>
         <div className="flex items-center justify-between">
           <CardTitle className="flex items-center gap-2">
@@ -210,13 +210,13 @@ export default function UpcomingWidget({ items }: UpcomingWidgetProps) {
           </div>
         </div>
       </CardHeader>
-      <CardContent className="flex-1 min-h-0 flex flex-col" style={{ minHeight: 200 }}>
+      <CardContent>
         {filteredCount === 0 ? (
           <p className="text-sm text-muted-foreground text-center py-8">
             {focusMode ? 'Nothing for today or tomorrow' : 'Nothing upcoming'}
           </p>
         ) : (
-          <ScrollArea className="flex-1 max-h-[400px]">
+          <ScrollArea className="max-h-[400px] -mr-2 pr-2">
             <div>
               {dayEntries.map(([dateKey, dayItems], groupIdx) => {
                 const isCollapsed = collapsedDays.has(dateKey);