Skip to content

Commit e8c2ede

Browse files
committed
update session styles
1 parent 617260a commit e8c2ede

3 files changed

Lines changed: 58 additions & 53 deletions

File tree

‎front/src/pods/trainer/components/session.component.tsx‎

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -35,39 +35,37 @@ export const SessionComponent: React.FC<Props> = props => {
3535
}, [log]);
3636

3737
return (
38-
<div className={cx(innerClasses.sessionContainer, className)}>
39-
<label className={innerClasses.labelTextarea} htmlFor="session">
38+
<form className={cx(innerClasses.root, className)}>
39+
<label className={innerClasses.label} htmlFor="session">
4040
Session
4141
</label>
4242

4343
<TextareaAutosize
4444
id="session"
4545
rowsMax={20}
4646
rowsMin={20}
47-
className={innerClasses.studentBoard}
47+
className={innerClasses.textarea}
4848
/>
49-
<div className={innerClasses.btnContainer}>
50-
<Button
51-
variant="contained"
52-
color="secondary"
53-
disableElevation
54-
className={innerClasses.undoBtn}
55-
onClick={() => handleSetSessionContent(log)}
56-
>
57-
<UndoIcon className={innerClasses.undoIcon} />
58-
Undo
59-
</Button>
60-
<Button
61-
variant="contained"
62-
color="primary"
63-
disableElevation
64-
className={innerClasses.sendBtn}
65-
onClick={() => handleSendFullContentLog(getFullContent(log))}
66-
>
67-
Send Full Content
68-
<ArrowForwardRoundedIcon className={innerClasses.sendIcon} />
69-
</Button>
70-
</div>
71-
</div>
49+
<Button
50+
variant="contained"
51+
color="secondary"
52+
disableElevation
53+
className={innerClasses.undoButton}
54+
onClick={() => handleSetSessionContent(log)}
55+
>
56+
<UndoIcon className={innerClasses.undoIcon} />
57+
Undo
58+
</Button>
59+
<Button
60+
variant="contained"
61+
color="primary"
62+
disableElevation
63+
className={innerClasses.sendButton}
64+
onClick={() => handleSendFullContentLog(getFullContent(log))}
65+
>
66+
Send Full Content
67+
<ArrowForwardRoundedIcon className={innerClasses.sendIcon} />
68+
</Button>
69+
</form>
7270
);
7371
};

‎front/src/pods/trainer/components/session.styles.ts‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,27 @@ import { theme } from 'core/theme';
44
const { palette, spacing, typography, breakpoints } = theme;
55
const color = palette.customPalette;
66

7-
export const sessionContainer = css`
8-
padding-top: ${spacing(7.5)};
9-
padding-bottom: ${spacing(10)};
7+
export const root = css`
8+
display: grid;
9+
grid-row-gap: 1rem;
10+
grid-column-gap: 1rem;
11+
grid-template-columns: auto 1fr;
12+
grid-template-areas:
13+
'label label'
14+
'textarea textarea'
15+
'undo send';
1016
`;
1117

12-
export const studentBoard = css`
18+
export const label = css`
19+
grid-area: label;
20+
display: block;
21+
font-size: 1.125rem;
22+
font-family: ${typography.fontFamily};
23+
`;
24+
25+
export const textarea = css`
26+
grid-area: textarea;
1327
box-sizing: border-box;
14-
width: 100%;
15-
margin-bottom: ${spacing(1.25)};
16-
margin-top: ${spacing(1.25)};
17-
padding: ${spacing(2)};
1828
font-family: ${typography.fontFamily};
1929
font-size: 1rem;
2030
background-color: ${color.background};
@@ -26,13 +36,8 @@ export const studentBoard = css`
2636
}
2737
`;
2838

29-
export const btnContainer = css`
30-
display: flex;
31-
margin-top: ${spacing(1.25)};
32-
padding-bottom: ${spacing(3.125)};
33-
`;
34-
35-
export const sendBtn = css`
39+
export const sendButton = css`
40+
grid-area: send;
3641
display: flex;
3742
align-items: center;
3843
padding: ${spacing(1.25)} ${spacing(1.875)};
@@ -67,15 +72,16 @@ export const sendBtn = css`
6772
export const sendIcon = css`
6873
margin-left: ${spacing(1.25)};
6974
font-size: 1.25rem;
70-
@media (max-width: ${breakpoints.values.xs}px) {
71-
display: none;
75+
display: none;
76+
@media (min-width: ${breakpoints.values.xs}px) {
77+
display: initial;
7278
}
7379
`;
7480

75-
export const undoBtn = css`
81+
export const undoButton = css`
82+
grid-area: undo;
7683
display: flex;
7784
align-items: center;
78-
margin-right: ${spacing(1.25)};
7985
padding: ${spacing(1.25)} ${spacing(1.875)};
8086
font-size: 1.188rem;
8187
font-weight: 400;
@@ -107,13 +113,8 @@ export const undoBtn = css`
107113
export const undoIcon = css`
108114
margin-right: ${spacing(1.25)};
109115
font-size: 1.25rem;
110-
@media (max-width: ${breakpoints.values.xs}px) {
111-
display: none;
116+
display: none;
117+
@media (min-width: ${breakpoints.values.xs}px) {
118+
display: initial;
112119
}
113120
`;
114-
115-
export const labelTextarea = css`
116-
display: block;
117-
font-size: 1.125rem;
118-
font-family: ${typography.fontFamily};
119-
`;

‎front/src/pods/trainer/trainer.styles.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,17 @@ export const root = css`
1010
grid-template-columns: 1fr;
1111
grid-row-gap: 1rem;
1212
grid-column-gap: 1rem;
13+
padding-top: 1rem;
14+
padding-bottom: 1rem;
1315
1416
& > :nth-child(n) {
1517
padding: 1rem;
1618
}
1719
20+
& > :last-child {
21+
padding-bottom: 2rem;
22+
}
23+
1824
@media (min-width: ${breakpoints.values.md}px) {
1925
grid-template-columns: 1fr 6fr 1fr;
2026
& > :nth-child(n) {

0 commit comments

Comments
 (0)