Skip to content

Commit eb45886

Browse files
committed
border fixes for workspace schedule button
1 parent d26b3b7 commit eb45886

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

site/src/components/WorkspaceScheduleButton/WorkspaceScheduleButton.tsx

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ dayjs.extend(relativeTime)
2828
dayjs.extend(timezone)
2929

3030
export const Language = {
31+
schedule: "Schedule",
3132
editDeadlineMinus: "Subtract one hour",
3233
editDeadlinePlus: "Add one hour",
3334
}
@@ -73,7 +74,7 @@ export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleButtonProps> = (
7374
}
7475

7576
return (
76-
<div className={styles.wrapper}>
77+
<span className={styles.wrapper}>
7778
<div className={styles.label}>
7879
<WorkspaceScheduleLabel workspace={workspace} />
7980
{canUpdateWorkspace && shouldDisplayPlusMinus(workspace) && (
@@ -101,15 +102,16 @@ export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleButtonProps> = (
101102
</Stack>
102103
)}
103104
</div>
104-
<div>
105+
<>
105106
<Button
106107
ref={anchorRef}
107108
startIcon={<ScheduleIcon />}
108109
onClick={() => {
109110
setIsOpen(true)
110111
}}
112+
className={styles.scheduleButton}
111113
>
112-
Schedule
114+
{Language.schedule}
113115
</Button>
114116
<Popover
115117
classes={{ paper: styles.popoverPaper }}
@@ -128,19 +130,19 @@ export const WorkspaceScheduleButton: React.FC<WorkspaceScheduleButtonProps> = (
128130
>
129131
<WorkspaceSchedule workspace={workspace} canUpdateWorkspace={canUpdateWorkspace} />
130132
</Popover>
131-
</div>
132-
</div>
133+
</>
134+
</span>
133135
)
134136
}
135137

136138
const useStyles = makeStyles((theme) => ({
137139
wrapper: {
138140
display: "flex",
139141
alignItems: "center",
142+
border: `1px solid ${theme.palette.divider}`,
143+
borderRadius: `${theme.shape.borderRadius}px`,
140144
},
141-
142145
label: {
143-
border: `1px solid ${theme.palette.divider}`,
144146
borderRight: 0,
145147
height: "100%",
146148
display: "flex",
@@ -150,11 +152,14 @@ const useStyles = makeStyles((theme) => ({
150152
// It is from the button props
151153
minHeight: 42,
152154
},
153-
155+
scheduleButton: {
156+
border: "none",
157+
borderLeft: `1px solid ${theme.palette.divider}`,
158+
borderRadius: `0px ${theme.shape.borderRadius}px ${theme.shape.borderRadius}px 0px`,
159+
},
154160
iconButton: {
155161
borderRadius: 2,
156162
},
157-
158163
popoverPaper: {
159164
padding: `${theme.spacing(2)}px ${theme.spacing(3)}px ${theme.spacing(3)}px`,
160165
},

0 commit comments

Comments
 (0)