Skip to content

Commit 67db899

Browse files
authored
tweak(styles): refine meeting schedule layout and interactivity
1 parent ef7a328 commit 67db899

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

src/components/scrollable_tabs/index.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,14 @@ function ScrollableTabs({
9494
background: 'var(--accent-150)',
9595
borderRadius: 'var(--radius-max)',
9696
},
97-
'& button:not(.Mui-selected)': { color: 'var(--grey-350)' },
97+
'& .MuiTab-root:not(.Mui-selected)': {
98+
color: 'var(--grey-350)',
99+
'&:hover': {
100+
background:
101+
'color-mix(in srgb, var(--accent-150) 38%, transparent)',
102+
borderRadius: 'var(--radius-max)',
103+
},
104+
},
98105
// Programatically changing color of ripple (wave) when click happens:
99106
'& span.MuiTouchRipple-rippleVisible': {
100107
color: 'var(--accent-main)',
@@ -114,6 +121,9 @@ function ScrollableTabs({
114121
},
115122
alignItems: 'center',
116123
minHeight,
124+
[`& .${tabsClasses.flexContainer}`]: {
125+
gap: '4px',
126+
},
117127
...sx,
118128
}}
119129
>

src/features/meetings/weekly_schedules/midweek_meeting/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import { MidweekMeetingProps } from './index.types';
3030
const MidweekMeeting = (props: MidweekMeetingProps) => {
3131
const { t } = useAppTranslation();
3232

33-
const { laptopUp, desktopUp } = useBreakpoints();
33+
const { laptopUp, tabletUp } = useBreakpoints();
3434

3535
const {
3636
week,
@@ -48,9 +48,9 @@ const MidweekMeeting = (props: MidweekMeetingProps) => {
4848
<PrimaryFieldContainer
4949
sx={{
5050
display: 'flex',
51-
alignItems: desktopUp ? 'center' : 'unset',
52-
gap: desktopUp ? '16px' : '4px',
53-
flexDirection: desktopUp ? 'row' : 'column',
51+
alignItems: tabletUp ? 'center' : 'unset',
52+
gap: tabletUp ? '16px' : '4px',
53+
flexDirection: tabletUp ? 'row' : 'column',
5454
}}
5555
>
5656
<WeekHeader week={week} dataView={props.dataView} />

src/features/meetings/weekly_schedules/part_timing/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const PartTiming = ({ time }: PartTimingProps) => {
88
color="grey"
99
text={time}
1010
centerContent
11+
className="label-small-medium"
1112
sx={{
1213
width: '45px',
1314
borderRadius: 'var(--radius-max)',

src/features/meetings/weekly_schedules/weekend_meeting/index.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import WatchtowerStudy from './watchtower_study';
2323
const WeekendMeeting = (props: WeekendMeetingProps) => {
2424
const { t } = useAppTranslation();
2525

26-
const { laptopUp, desktopUp } = useBreakpoints();
26+
const { laptopUp, tabletUp } = useBreakpoints();
2727

2828
const {
2929
week,
@@ -42,9 +42,9 @@ const WeekendMeeting = (props: WeekendMeetingProps) => {
4242
<PrimaryFieldContainer
4343
sx={{
4444
display: 'flex',
45-
alignItems: desktopUp ? 'center' : 'unset',
46-
gap: desktopUp ? '16px' : '4px',
47-
flexDirection: desktopUp ? 'row' : 'column',
45+
alignItems: tabletUp ? 'center' : 'unset',
46+
gap: tabletUp ? '16px' : '4px',
47+
flexDirection: tabletUp ? 'row' : 'column',
4848
}}
4949
>
5050
<Typography className="h2">{weekDateLocale}</Typography>

0 commit comments

Comments
 (0)