From e59b9754648fbf6388f1e0f05fb173e24842b728 Mon Sep 17 00:00:00 2001
From: French-Asgeir <109287366+French-Asgeir@users.noreply.github.com>
Date: Mon, 24 Aug 2026 02:57:25 +0200
Subject: [PATCH 1/2] fix: event toolbar overflow in edit mode

---
 components/calendar/event-modal.tsx | 36 +++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/components/calendar/event-modal.tsx b/components/calendar/event-modal.tsx
index 7069d9185..cd1bbf588 100644
--- a/components/calendar/event-modal.tsx
+++ b/components/calendar/event-modal.tsx
@@ -1357,11 +1357,11 @@ export function EventModal({
         </div>
       </div>
 
-      <div className="flex items-center justify-between px-6 py-4 border-t border-border flex-shrink-0">
-        <div className="flex items-center gap-1">
+      <div className="flex items-center justify-between px-6 py-4 border-t border-border flex-shrink-0 flex-wrap gap-y-2">
+        <div className="flex items-center gap-1 w-full">
           {isEdit && onDelete && (
             showDeleteConfirm ? (
-              <div className="flex items-center gap-2">
+              <div className="flex items-center gap-2 flex-wrap">
                 <div>
                   <span className="text-sm text-red-600 dark:text-red-400">
                     {t("form.delete_confirm")}
@@ -1376,11 +1376,16 @@ export function EventModal({
                   variant="outline"
                   size="sm"
                   onClick={() => { onDelete(event!.id, hasParticipants || undefined); onClose(); }}
-                  className="text-red-600 dark:text-red-400 border-red-300 dark:border-red-700"
+                  className="text-red-600 dark:text-red-400 border-red-300 dark:border-red-700 w-full"
                 >
                   {t("events.delete")}
                 </Button>
-                <Button variant="ghost" size="sm" onClick={() => setShowDeleteConfirm(false)}>
+                <Button 
+                  variant="ghost" 
+                  size="sm" 
+                  onClick={() => setShowDeleteConfirm(false)}
+                  className="w-full"
+                >
                   {t("form.cancel")}
                 </Button>
               </div>
@@ -1389,7 +1394,7 @@ export function EventModal({
                 variant="ghost"
                 size="sm"
                 onClick={() => setShowDeleteConfirm(true)}
-                className="text-red-600 dark:text-red-400"
+                className="text-red-600 dark:text-red-400 w-full"
               >
                 <Trash2 className="w-4 h-4 me-1" />
                 {t("events.delete")}
@@ -1402,21 +1407,32 @@ export function EventModal({
               size="sm"
               onClick={handleDuplicate}
               aria-label={t("events.duplicate")}
+              className="w-full"
             >
               <Copy className="w-4 h-4 me-1" />
               {t("events.duplicate")}
             </Button>
           )}
         </div>
-
-        <div className="flex gap-2">
-          <Button variant="outline" onClick={isEdit ? () => setMode("view") : onClose}>
+        
+        {isEdit && !showDeleteConfirm && (
+        <div className="flex gap-2 w-full">
+          <Button 
+            variant="outline"
+            onClick={isEdit ? () => setMode("view") : onClose}
+            className="w-full"
+          >
             {t("form.cancel")}
           </Button>
-          <Button onClick={handleSave} disabled={!title.trim() || isSaving}>
+          <Button
+            onClick={handleSave} 
+            disabled={!title.trim() || isSaving}
+            className="w-full"
+          >
             {t("form.save")}
           </Button>
         </div>
+        )}
       </div>
     </div>
   );

From 7046f2d5579071ca720f769c52c1b999438af4bf Mon Sep 17 00:00:00 2001
From: French-Asgeir <109287366+French-Asgeir@users.noreply.github.com>
Date: Tue, 25 Aug 2026 20:20:29 +0200
Subject: [PATCH 2/2] fix: fix save and cancel button being unavailable when
 event is created

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 components/calendar/event-modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/calendar/event-modal.tsx b/components/calendar/event-modal.tsx
index cd1bbf588..0e6a760d3 100644
--- a/components/calendar/event-modal.tsx
+++ b/components/calendar/event-modal.tsx
@@ -1415,7 +1415,7 @@ export function EventModal({
           )}
         </div>
         
-        {isEdit && !showDeleteConfirm && (
+        {!showDeleteConfirm && (
         <div className="flex gap-2 w-full">
           <Button 
             variant="outline"