Skip to content

Commit f55d5be

Browse files
committed
Made tasks have their own scrollbar
1 parent 6f1a4bb commit f55d5be

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

front/taskwizard-front/src/pages/Dashboard.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ function Dashboard () {
145145
<Flex justifyContent='center' alignItems='center' direction='column' gap='30px' mb = '5'>
146146
<Heading fontSize = 'xl' mb ='-3'>Today's Progress:</Heading>
147147
<Progress w='300px' colorScheme='teal' borderRadius='lg' value={100 * progress}></Progress>
148-
</Flex>
148+
</Flex>
149149
</Flex>
150150
<NewTask isOpen={isOpenNewTask} onClose= {onCloseNewTask}></NewTask>
151151
<FriendsList isOpen={isOpenFriendsList} onClose = {onCloseFriendsList} friendsData={friendsData}/>
152152
<Tabs isFitted variant='enclosed' defaultIndex={today}>
153153
<TabList mb='1em'>
154154
<Tab fontSize={screenCutoff ? 'm' : 'xs'} fontWeight={today === 0 ? 'bold' : 'normal'}>{screenCutoff ? 'Sunday' : 'Sun'} {formatDate(weekDates[0])}</Tab>
155-
<Tab fontSize={screenCutoff ? 'm' : 'xs'} fontWeight={today === 2 ? 'bold' : 'normal'}>{screenCutoff ? 'Tuesday' : 'Tue'} {formatDate(weekDates[2])}</Tab>
156155
<Tab fontSize={screenCutoff ? 'm' : 'xs'} fontWeight={today === 1 ? 'bold' : 'normal'}>{screenCutoff ? 'Monday' : 'Mon'} {formatDate(weekDates[1])}</Tab>
156+
<Tab fontSize={screenCutoff ? 'm' : 'xs'} fontWeight={today === 2 ? 'bold' : 'normal'}>{screenCutoff ? 'Tuesday' : 'Tue'} {formatDate(weekDates[2])}</Tab>
157157
<Tab fontSize={screenCutoff ? 'm' : 'xs'} fontWeight={today === 3 ? 'bold' : 'normal'}>{screenCutoff ? 'Wednesday' : 'Wed'} {formatDate(weekDates[3])}</Tab>
158158
<Tab fontSize={screenCutoff ? 'm' : 'xs'} fontWeight={today === 4 ? 'bold' : 'normal'}>{screenCutoff ? 'Thursday' : 'Thu'} {formatDate(weekDates[4])}</Tab>
159159
<Tab fontSize={screenCutoff ? 'm' : 'xs'} fontWeight={today === 5 ? 'bold' : 'normal'}>{screenCutoff ? 'Friday' : 'Fri'} {formatDate(weekDates[5])}</Tab>
@@ -168,7 +168,7 @@ function Dashboard () {
168168
</Skeleton>
169169
</TabPanel>
170170
<TabPanel>
171-
<Skeleton isLoaded={loaded}>
171+
<Skeleton isLoaded={loaded} h={screenCutoff ? '70vh' : '60vh'} overflow='auto' w = '100%'>
172172
<Flex gap='30px' flexWrap='wrap' justifyContent='center' w='100%'>
173173
{ today === 1 ? renderStartableTasks(1) : renderViewTasks(1) }
174174
</Flex>

0 commit comments

Comments
 (0)