From b5dc2fe1d986bd615df146fb6a8eaaf790f38804 Mon Sep 17 00:00:00 2001 From: sarvottamchaturvedi Date: Wed, 15 Apr 2026 13:49:49 +0530 Subject: [PATCH 1/2] Issue #135 Navbar Positioning and Added Lunchtime in timetable --- .../Timetable/TimetableContainer.jsx | 67 ++++++++++++++++++- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/src/components/Timetable/TimetableContainer.jsx b/src/components/Timetable/TimetableContainer.jsx index a681c8c..ed867a0 100644 --- a/src/components/Timetable/TimetableContainer.jsx +++ b/src/components/Timetable/TimetableContainer.jsx @@ -1199,6 +1199,9 @@ const DayView = ({ {isToday && } + + LUNCH + {processedDayEvents.map((event) => { const course = coursedata[event.courseCode] @@ -1645,6 +1648,8 @@ const WeekView = ({ ))} + LUNCH + {/* 4. Map over the `daysOfWeek` array again for the columns, using the index. */} {daysOfWeek.map((day, dayIndex) => { // The index (0-6) will correctly correspond to Monday-Sunday. @@ -2402,9 +2407,9 @@ const SubHeader = styled.div` const TimetablePageHeadingWrapper = styled.div` padding-bottom: 0.75rem; margin-bottom: -10px; - position: sticky; - top: 0; - z-index: 100; + // position: sticky; + // top: 0; + // z-index: 100; background: ${({ theme }) => theme.bg}; width: 100%; border-bottom: 1px solid rgba(255, 255, 255, 0.2); @@ -2724,6 +2729,7 @@ const WeekGrid = styled.div` min-width: 800px; width: 100%; color: #ffffff0f; + position: relative; ` const WeekTimeColumn = styled.div` @@ -3120,3 +3126,58 @@ const CourseCardContent = styled.div` justify-content: space-between; align-items: center; ` + +const LunchBlock = styled.div` + position: absolute; + top: 240px; + left: 0; + width: 100%; + height: 30px; + + background-color: ${({ theme }) => theme.secondary || '#2b273b'}; + + background-image: linear-gradient(90deg, rgba(34, 70, 168, 0.79) 0%, rgba(34, 70, 168, 0.31) 100%); + + border: 1px dashed rgba(59, 130, 246, 0.4); + border-radius: 6px; + + display: flex; + align-items: center; + justify-content: center; + + color: #c3c6cb; + font-size: 0.9rem; + font-weight: 500; + font-family: "Century Schoolbook", "Century", "Helvetica Neue", Helvetica, serif; + + z-index: 1; + pointer-events: none; + box-sizing: border-box; +` + +const WeekLunchBlock = styled.div` + position: absolute; + top: 240px; + left: 80px; + width: calc(100% - 80px); + height: 30px; + + background-color: ${({ theme }) => theme.secondary || '#2b273b'}; + background-image: linear-gradient(90deg, rgba(34, 70, 168, 0.79) 0%, rgba(34, 70, 168, 0.31) 100%); + + border: 1px dashed rgba(59, 130, 246, 0.4); + border-radius: 6px; + + display: flex; + align-items: center; + justify-content: center; + + color: #c3c6cb; + font-size: 1rem; + font-weight: 500; + font-family: "Century Schoolbook", "Century", "Helvetica Neue", Helvetica, serif; + + z-index: 1; + pointer-events: none; + box-sizing: border-box; +` \ No newline at end of file From 389e9e81516c420299c31fdef6c369e30a5b3a96 Mon Sep 17 00:00:00 2001 From: sarvottamchaturvedi Date: Wed, 15 Apr 2026 18:53:00 +0530 Subject: [PATCH 2/2] Edit in lunchtime in timetable --- src/components/Timetable/TimetableContainer.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Timetable/TimetableContainer.jsx b/src/components/Timetable/TimetableContainer.jsx index f01bc99..d0851fa 100644 --- a/src/components/Timetable/TimetableContainer.jsx +++ b/src/components/Timetable/TimetableContainer.jsx @@ -3134,7 +3134,7 @@ const LunchBlock = styled.div` top: 240px; left: 0; width: 100%; - height: 30px; + height: 90px; background-color: ${({ theme }) => theme.secondary || '#2b273b'}; @@ -3162,7 +3162,7 @@ const WeekLunchBlock = styled.div` top: 240px; left: 80px; width: calc(100% - 80px); - height: 30px; + height: 90px; background-color: ${({ theme }) => theme.secondary || '#2b273b'}; background-image: linear-gradient(90deg, rgba(34, 70, 168, 0.79) 0%, rgba(34, 70, 168, 0.31) 100%);