From 8561e3b63d8ff285eec1a2ac709d49b8164dda77 Mon Sep 17 00:00:00 2001
From: jzgom067 <jzgombic3@gmail.com>
Date: Mon, 17 Aug 2026 22:06:58 -0400
Subject: [PATCH 1/7] Shrink custom scrollbar

---
 frontend/src/styles/scrollbar.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/styles/scrollbar.css b/frontend/src/styles/scrollbar.css
index 9ecbc2342..60669b7cb 100644
--- a/frontend/src/styles/scrollbar.css
+++ b/frontend/src/styles/scrollbar.css
@@ -17,7 +17,7 @@
 }
 
 ::-webkit-scrollbar {
-  width: 16px;
+  width: 12px;
   background-color: transparent;
 }
 
@@ -25,7 +25,7 @@
   background-color: var(--sb-track-color);
 
   /* floating track */
-  border: 4px solid transparent;
+  border: 3px solid transparent;
   border-radius: 100vh;
   background-clip: padding-box;
 
@@ -37,7 +37,7 @@
   background-color: var(--sb-thumb-color);
 
   /* floating track */
-  border: 4px solid transparent;
+  border: 3px solid transparent;
   border-radius: 100vh;
   background-clip: padding-box;
 }

From 18432ad5eac1e5fda9fb7ad18408c58ef6a07e08 Mon Sep 17 00:00:00 2001
From: jzgom067 <jzgombic3@gmail.com>
Date: Mon, 17 Aug 2026 22:10:48 -0400
Subject: [PATCH 2/7] Add size increase to thumb on hover

---
 frontend/src/styles/scrollbar.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/styles/scrollbar.css b/frontend/src/styles/scrollbar.css
index 60669b7cb..9a2c7a71b 100644
--- a/frontend/src/styles/scrollbar.css
+++ b/frontend/src/styles/scrollbar.css
@@ -44,4 +44,5 @@
 
 ::-webkit-scrollbar-thumb:hover {
   background-color: var(--foreground);
+  border: 2px solid transparent;
 }

From 8831ec68438a03a4649178b880c68758465829a9 Mon Sep 17 00:00:00 2001
From: jzgom067 <jzgombic3@gmail.com>
Date: Mon, 17 Aug 2026 22:11:33 -0400
Subject: [PATCH 3/7] Adjust grid header for scrollbar size change

---
 frontend/src/features/event/grid/schedule-header.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/features/event/grid/schedule-header.tsx b/frontend/src/features/event/grid/schedule-header.tsx
index 7f411402d..46c3cc654 100644
--- a/frontend/src/features/event/grid/schedule-header.tsx
+++ b/frontend/src/features/event/grid/schedule-header.tsx
@@ -55,7 +55,7 @@ export default function ScheduleHeader({
     <div
       className={cn(
         preview ? "md:bg-panel top-0" : cn(topMarginClass, "bg-background"),
-        scrollbarPresent && "pr-4",
+        scrollbarPresent && "pr-3",
         "sticky z-10 col-span-2 grid h-[50px] w-full items-center justify-center",
       )}
       style={{

From dac6cab22ea32bbc228eaf68c32066343d483d62 Mon Sep 17 00:00:00 2001
From: jzgom067 <jzgombic3@gmail.com>
Date: Mon, 17 Aug 2026 22:13:01 -0400
Subject: [PATCH 4/7] Add persistent scrollbar

---
 frontend/src/styles/scrollbar.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/styles/scrollbar.css b/frontend/src/styles/scrollbar.css
index 9a2c7a71b..34b3874f2 100644
--- a/frontend/src/styles/scrollbar.css
+++ b/frontend/src/styles/scrollbar.css
@@ -12,6 +12,10 @@
   }
 }
 
+html {
+  overflow-y: scroll;
+}
+
 ::-webkit-scrollbar-button {
   display: none;
 }

From f5c3c363e9a45699d5c5f9ec7c34051959d1f53f Mon Sep 17 00:00:00 2001
From: jzgom067 <jzgombic3@gmail.com>
Date: Mon, 17 Aug 2026 22:20:05 -0400
Subject: [PATCH 5/7] Disable radix scrollbar space handling

---
 frontend/src/styles/radix.css | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/frontend/src/styles/radix.css b/frontend/src/styles/radix.css
index 9c795ea28..82940c35b 100644
--- a/frontend/src/styles/radix.css
+++ b/frontend/src/styles/radix.css
@@ -98,3 +98,17 @@
     transform: scale(0.95) translateY(10px);
   }
 }
+
+/* Disabling scrollbar margin management */
+html body[data-scroll-locked] {
+  /*
+    When opening a modal, Radix will add padding/margin to the body to counteract a
+    dynamic scrollbar that disappears.
+
+    Our custom scrollbar was made persistent, so we want to override this behavior,
+    otherwise the content will shift to the left anyway when opening a modal.
+  */
+  --removed-body-scroll-bar-size: 0px !important;
+  margin-right: 0px !important;
+  padding-right: 0px !important;
+}

From ac4ff60d563aff7305cfc53af4b92069ae91ea1a Mon Sep 17 00:00:00 2001
From: jzgom067 <jzgombic3@gmail.com>
Date: Mon, 17 Aug 2026 22:40:55 -0400
Subject: [PATCH 6/7] Fix horizontal grid scroll on highlight

---
 frontend/src/features/event/grid/timeblocks/base.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/features/event/grid/timeblocks/base.tsx b/frontend/src/features/event/grid/timeblocks/base.tsx
index 2eea3cce3..d69142cb7 100644
--- a/frontend/src/features/event/grid/timeblocks/base.tsx
+++ b/frontend/src/features/event/grid/timeblocks/base.tsx
@@ -15,7 +15,7 @@ export default function BaseTimeBlock({
 }: TimeBlockProps) {
   return (
     <div
-      className="relative isolate grid"
+      className="relative isolate grid overflow-x-clip"
       onMouseLeave={onMouseLeave}
       style={{
         gridTemplateColumns: `${TIME_LABEL_WIDTH}px 1fr ${hasNext ? SIDE_WIDTH : 10}px`,

From 2e5c47c54a47e5d37d32e55920a03b83c9efdf7b Mon Sep 17 00:00:00 2001
From: jzgom067 <jzgombic3@gmail.com>
Date: Mon, 17 Aug 2026 23:12:58 -0400
Subject: [PATCH 7/7] Add empty line for style compliance

---
 frontend/src/styles/radix.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/styles/radix.css b/frontend/src/styles/radix.css
index 82940c35b..1e6ae7613 100644
--- a/frontend/src/styles/radix.css
+++ b/frontend/src/styles/radix.css
@@ -109,6 +109,7 @@ html body[data-scroll-locked] {
     otherwise the content will shift to the left anyway when opening a modal.
   */
   --removed-body-scroll-bar-size: 0px !important;
+
   margin-right: 0px !important;
   padding-right: 0px !important;
 }