From 8c0cd5b99fcaf401a23c6bba0569c4fa28e7f6f4 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Tue, 18 Mar 2025 03:41:49 +0000 Subject: [PATCH 1/4] fix(agenda): strikethrough cancelled and rescheduled events --- client/agenda/AgendaScheduleList.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue index ab0f6e01847..b3fef4510e2 100644 --- a/client/agenda/AgendaScheduleList.vue +++ b/client/agenda/AgendaScheduleList.vue @@ -1279,6 +1279,11 @@ onBeforeUnmount(() => { &.agenda-table-cell-room { border-right: 1px solid darken($red-100, 5%) !important; + text-decoration: line-through; + } + + &.agenda-table-cell-name { + text-decoration: line-through; } &:last-child { @@ -1306,6 +1311,11 @@ onBeforeUnmount(() => { &.agenda-table-cell-room { border-right: 1px solid darken($orange-100, 5%) !important; + text-decoration: line-through; + } + + &.agenda-table-cell-name { + text-decoration: line-through; } &:last-child { From 6f79f7e478dc87044eebbeb0d6391310c4f63837 Mon Sep 17 00:00:00 2001 From: NGPixel Date: Fri, 21 Mar 2025 00:38:15 +0000 Subject: [PATCH 2/4] fix(agenda): rescheduled + canceled badges width on mobile --- client/agenda/AgendaScheduleList.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue index b3fef4510e2..5640ff6fd3e 100644 --- a/client/agenda/AgendaScheduleList.vue +++ b/client/agenda/AgendaScheduleList.vue @@ -1087,11 +1087,13 @@ onBeforeUnmount(() => { .badge.is-cancelled { background-color: $red-500; text-transform: uppercase; + width: 100px; } .badge.is-rescheduled { background-color: $orange-500; text-transform: uppercase; + width: 100px; } } } @@ -1282,7 +1284,7 @@ onBeforeUnmount(() => { text-decoration: line-through; } - &.agenda-table-cell-name { + &.agenda-table-cell-name > a, &.agenda-table-cell-name > span { text-decoration: line-through; } @@ -1314,7 +1316,7 @@ onBeforeUnmount(() => { text-decoration: line-through; } - &.agenda-table-cell-name { + &.agenda-table-cell-name > a, &.agenda-table-cell-name > span { text-decoration: line-through; } From d9e70e8c3b3ac0a0501059fee452bb1fa67237ed Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Fri, 21 Mar 2025 01:26:13 -0400 Subject: [PATCH 3/4] fix(agenda): use em for canceled / rescheduled badge on mobile --- client/agenda/AgendaScheduleList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue index 5640ff6fd3e..f153dbab88d 100644 --- a/client/agenda/AgendaScheduleList.vue +++ b/client/agenda/AgendaScheduleList.vue @@ -1087,13 +1087,13 @@ onBeforeUnmount(() => { .badge.is-cancelled { background-color: $red-500; text-transform: uppercase; - width: 100px; + width: 10em; } .badge.is-rescheduled { background-color: $orange-500; text-transform: uppercase; - width: 100px; + width: 10em; } } } From 5862533f3bb4bed182e975f8d0d34d822ecbfa01 Mon Sep 17 00:00:00 2001 From: Matthew Holloway Date: Fri, 21 Mar 2025 22:05:20 +1300 Subject: [PATCH 4/4] fix: deleting badge width/display:block CSS --- client/agenda/AgendaDetailsModal.vue | 1 - client/agenda/AgendaScheduleCalendar.vue | 1 - client/agenda/AgendaScheduleList.vue | 4 ---- 3 files changed, 6 deletions(-) diff --git a/client/agenda/AgendaDetailsModal.vue b/client/agenda/AgendaDetailsModal.vue index 037e32f9cb1..2582bf21593 100644 --- a/client/agenda/AgendaDetailsModal.vue +++ b/client/agenda/AgendaDetailsModal.vue @@ -327,7 +327,6 @@ async function fetchSessionMaterials () { border-radius: 5px; .badge { - width: 30px; font-size: .7em; background-color: $yellow-200; border-bottom: 1px solid $yellow-500; diff --git a/client/agenda/AgendaScheduleCalendar.vue b/client/agenda/AgendaScheduleCalendar.vue index 9b56b7f5a74..46887d740f0 100644 --- a/client/agenda/AgendaScheduleCalendar.vue +++ b/client/agenda/AgendaScheduleCalendar.vue @@ -326,7 +326,6 @@ function close () { } .badge { - width: 30px; font-size: .7em; border: 1px solid #CCC; text-transform: uppercase; diff --git a/client/agenda/AgendaScheduleList.vue b/client/agenda/AgendaScheduleList.vue index f153dbab88d..297d5adc292 100644 --- a/client/agenda/AgendaScheduleList.vue +++ b/client/agenda/AgendaScheduleList.vue @@ -1055,8 +1055,6 @@ onBeforeUnmount(() => { } @media screen and (max-width: $bs5-break-md) { - width: 30px; - display: block; margin: 2px 0 0 0; } } @@ -1087,13 +1085,11 @@ onBeforeUnmount(() => { .badge.is-cancelled { background-color: $red-500; text-transform: uppercase; - width: 10em; } .badge.is-rescheduled { background-color: $orange-500; text-transform: uppercase; - width: 10em; } } }