From 96daccd92371e072e7b6628688445426d1e6cf5a Mon Sep 17 00:00:00 2001
From: Benno Tielen <Benno@tielen.nl>
Date: Mon, 6 Jul 2026 11:40:04 +0200
Subject: [PATCH] fix: cancelled styling

---
 src/components/EventRow/EventRow.tsx          | 31 ++++++++++---------
 src/components/EventRow/styles.module.scss    | 14 ++++++++-
 .../MassTable/MassTableRow.stories.ts         |  9 ++++++
 src/components/MassTable/MassTableRow.tsx     | 18 ++++++-----
 src/components/MassTable/styles.module.scss   | 14 +++++++--
 5 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/src/components/EventRow/EventRow.tsx b/src/components/EventRow/EventRow.tsx
index ba8ca17..e4cd51d 100644
--- a/src/components/EventRow/EventRow.tsx
+++ b/src/components/EventRow/EventRow.tsx
@@ -73,21 +73,22 @@ export const EventRow = ({date, end, title, location, cancelled, href, color = "
           [styles.lineWhite]: color === "white",
         })}></div>
 
-        <div className={classNames({
-          [styles.details]: true,
-          [styles.cancelled]: cancelled
-        })}>
-          {title} <br />
-          { showDate &&
-            <>
-              {dateObj.toLocaleDateString("de-DE", { weekday: "long" })}
-              {dayFormat === "long" && " " + dateObj.toLocaleDateString("de-DE", { dateStyle: "short" })}, {dateObj.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" })}
-              { endObj ? <> - {endObj.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" })}</> : "" }
-                &nbsp;Uhr
-              <br />
-            </>
-          }
-          {location}
+        <div className={styles.details}>
+          <span className={classNames({ [styles.cancelled]: cancelled })}>{title}</span>
+          {cancelled && <span className={styles.cancelledLabel}>Abgesagt</span>}
+          <br />
+          <span className={classNames({ [styles.cancelled]: cancelled })}>
+            { showDate &&
+              <>
+                {dateObj.toLocaleDateString("de-DE", { weekday: "long" })}
+                {dayFormat === "long" && " " + dateObj.toLocaleDateString("de-DE", { dateStyle: "short" })}, {dateObj.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" })}
+                { endObj ? <> - {endObj.toLocaleTimeString("de-DE", { timeStyle: "short", timeZone: "Europe/Berlin" })}</> : "" }
+                  &nbsp;Uhr
+                <br />
+              </>
+            }
+            {location}
+          </span>
         </div>
       </div>
     </Link>
diff --git a/src/components/EventRow/styles.module.scss b/src/components/EventRow/styles.module.scss
index aad0b5a..5f5301a 100644
--- a/src/components/EventRow/styles.module.scss
+++ b/src/components/EventRow/styles.module.scss
@@ -52,7 +52,19 @@
 }
 
 .cancelled {
-  text-decoration: line-through;
+  color: #757575;
+  // line-through can't be repositioned, so draw an underline and pull it
+  // up into the text; a less negative offset moves the line further down
+  text-decoration: underline;
+  text-decoration-skip-ink: none;
+  text-underline-offset: -0.25em;
+}
+
+.cancelledLabel {
+  margin-left: 8px;
+  font-size: 12px;
+  font-weight: 600;
+  color: #b3261e;
 }
 
 .container:hover .dayBase {
diff --git a/src/components/MassTable/MassTableRow.stories.ts b/src/components/MassTable/MassTableRow.stories.ts
index b4f6dc3..62015fe 100644
--- a/src/components/MassTable/MassTableRow.stories.ts
+++ b/src/components/MassTable/MassTableRow.stories.ts
@@ -61,3 +61,12 @@ export const Cancelled: Story = {
     cancelled: true,
   },
 }
+
+export const CancelledLongDayName: Story = {
+  args: {
+    id: '1',
+    date: '2024-08-22T15:00:00.000Z',
+    type: 'WORD',
+    cancelled: true,
+  },
+}
diff --git a/src/components/MassTable/MassTableRow.tsx b/src/components/MassTable/MassTableRow.tsx
index e747b8a..d512e72 100644
--- a/src/components/MassTable/MassTableRow.tsx
+++ b/src/components/MassTable/MassTableRow.tsx
@@ -32,30 +32,34 @@ export const MassTableRow = ({
   return (
     <Link
       href={`/gottesdienst/${id}`}
-      className={classNames({ [styles.cancelled]: cancelled }, styles.link)}
+      className={styles.link}
     >
       <div
         className={styles.row}
         onMouseEnter={() => setSymbol('†')}
         onMouseLeave={() => setSymbol('')}
       >
-        <div className={styles.day}>{day}</div>
-        <div className={styles.symbol}>{symbol}</div>
+        <div className={classNames({ [styles.cancelled]: cancelled }, styles.day)}>{day}</div>
+        <div className={styles.symbol}>{!cancelled && symbol}</div>
         <div className={styles.time}>
-          {time}
+          <span className={classNames({ [styles.cancelled]: cancelled })}>
+            {time}
+          </span>
 
-          {type === 'FAMILY' && (
+          {!cancelled && type === 'FAMILY' && (
             <Image src={family} width={18} height={18} alt={'Familien Messe'} />
           )}
 
-          {type === 'WORD' && (
+          {!cancelled && type === 'WORD' && (
             <Image src={bible} width={18} height={18} alt={'Wortgottesfeier'} />
           )}
 
-          {type === 'LANGUAGE' && (
+          {!cancelled && type === 'LANGUAGE' && (
             <Image src={language} width={18} height={18} alt={'Fremdsprache'} />
           )}
         </div>
+
+        {cancelled && <span className={styles.cancelledLabel}>Abgesagt</span>}
       </div>
     </Link>
   )
diff --git a/src/components/MassTable/styles.module.scss b/src/components/MassTable/styles.module.scss
index 0551269..d2e6783 100644
--- a/src/components/MassTable/styles.module.scss
+++ b/src/components/MassTable/styles.module.scss
@@ -6,7 +6,7 @@
   height: 24px;
   cursor: pointer;
   font-size: 18px;
-  align-items: flex-start;
+  align-items: baseline;
   margin-bottom: 3px;
 }
 
@@ -27,7 +27,16 @@
 }
 
 .cancelled {
-  text-decoration: line-through;
+  color: #757575;
+  text-decoration: underline;
+  text-decoration-skip-ink: none;
+  text-underline-offset: -0.25em;
+}
+
+.cancelledLabel {
+  font-size: 12px;
+  font-weight: 600;
+  color: #b3261e;
 }
 
 .symbol {
@@ -39,6 +48,7 @@
 .day {
   flex-shrink: 0;
   width: 90px;
+  line-height: 1.2em;
 }
 
 .time {