Skip to content

Commit b361e9b

Browse files
committed
styles reorganized
1 parent f1a9294 commit b361e9b

7 files changed

Lines changed: 96 additions & 95 deletions

File tree

‎front/src/common-app/components/appbar/appbar.styles.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ const { palette, spacing, breakpoints } = theme;
55
const color = palette.customPalette;
66

77
export const appbarContainer = css`
8-
width: 100%;
98
display: flex;
109
align-items: center;
10+
width: 100%;
1111
height: ${spacing(10.75)};
1212
background-image: linear-gradient(
1313
60deg,
@@ -17,11 +17,11 @@ export const appbarContainer = css`
1717
);
1818
border-bottom: 2px solid ${color.secondary};
1919
@media (max-width: ${breakpoints.values.sm}px) {
20-
height: auto;
21-
min-height: ${spacing(10.75)};
2220
flex-direction: column;
2321
justify-content: center;
2422
align-items: center;
23+
height: auto;
24+
min-height: ${spacing(10.75)};
2525
background-image: linear-gradient(
2626
60deg,
2727
${color.background},
@@ -31,13 +31,13 @@ export const appbarContainer = css`
3131
`;
3232

3333
export const logo = (showLinks: boolean): string => css`
34-
margin-top: ${spacing(0.625)};
3534
height: ${spacing(7.5)};
36-
fill: ${color.secondary};
35+
margin-top: ${spacing(0.625)};
3736
margin-left: ${spacing(4.8)};
37+
fill: ${color.secondary};
3838
@media (max-width: ${breakpoints.values.sm}px) {
39-
margin-left: 0;
4039
margin-top: ${showLinks ? spacing(3) : 0};
40+
margin-left: 0;
4141
}
4242
`;
4343

@@ -68,13 +68,13 @@ export const listItem = css`
6868
`;
6969

7070
export const link = css`
71-
font-size: ${spacing(2.2)};
72-
margin-top: ${spacing(0.4)};
7371
position: relative;
7472
display: inline-block;
73+
margin-top: ${spacing(0.4)};
74+
padding-bottom: ${spacing(0.4)};
75+
font-size: 1.1rem;
7576
text-decoration: none;
7677
color: ${color.secondary};
77-
padding-bottom: ${spacing(0.4)};
7878
border-bottom: 2px solid transparent;
7979
transition: all 0.3s ease;
8080
-webkit-transition: all 0.3s ease;

‎front/src/common-app/components/footer/footer.styles.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,41 +20,41 @@ export const footerContainer = css`
2020
`;
2121

2222
export const topContainer = css`
23-
padding: 0 ${spacing(2)};
2423
display: flex;
2524
justify-content: space-between;
2625
height: ${spacing(24.375)};
26+
padding: 0 ${spacing(2)};
2727
align-items: center;
2828
@media (max-width: ${breakpoints.values.xs}px) {
2929
flex-direction: column-reverse;
30-
align-items: center;
3130
justify-content: center;
31+
align-items: center;
3232
height: ${spacing(27.5)};
3333
}
3434
`;
3535

3636
export const topContainerCenter = css`
37-
padding: 0 ${spacing(2)};
3837
display: flex;
3938
justify-content: center;
4039
align-items: center;
4140
height: ${spacing(24.375)};
41+
padding: 0 ${spacing(2)};
4242
`;
4343

4444
export const linkList = css`
45-
padding: 0;
4645
margin: 0;
46+
padding: 0;
4747
list-style: none;
4848
@media (max-width: ${breakpoints.values.xs}px) {
49-
text-align: center;
5049
margin-top: ${spacing(2.4)};
50+
text-align: center;
5151
}
5252
`;
5353

5454
export const link = css`
55-
font-size: ${spacing(2.2)};
56-
color: ${color.greyLight};
55+
font-size: 1.1rem;
5756
text-decoration: none;
57+
color: ${color.greyLight};
5858
&:hover {
5959
color: ${color.primary};
6060
}
@@ -63,12 +63,12 @@ export const link = css`
6363
export const bottomContainer = css`
6464
display: flex;
6565
justify-content: space-between;
66-
border-top: 1px solid ${color.primary};
6766
padding-top: ${spacing(2)};
67+
border-top: 1px solid ${color.primary};
6868
@media (max-width: ${breakpoints.values.xs}px) {
6969
flex-direction: column;
70-
align-items: center;
7170
justify-content: center;
71+
align-items: center;
7272
}
7373
`;
7474

@@ -78,8 +78,8 @@ export const lemoncodeIcon = css`
7878

7979
export const iconContainer = css`
8080
display: flex;
81-
padding: 0;
8281
margin: 0;
82+
padding: 0;
8383
list-style: none;
8484
`;
8585

@@ -94,8 +94,8 @@ export const iconListItem = css`
9494
`;
9595

9696
export const icon = css`
97+
font-size: 1.5rem;
9798
color: ${color.greyLight};
98-
font-size: ${spacing(3)};
9999
&:hover {
100100
cursor: pointer;
101101
color: ${color.primary};

‎front/src/pods/create-session/create-session.styles.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,30 @@ const color = palette.customPalette;
77

88
export const mainContainer = css`
99
position: relative;
10-
background-image: url(${background});
11-
background-repeat: no-repeat;
12-
background-position: right bottom;
1310
display: flex;
1411
align-items: center;
15-
margin: 0;
16-
padding: 0;
1712
width: 100%;
1813
height: calc(100vh - ${spacing(10.75)});
14+
margin: 0;
15+
padding: 0;
16+
background-image: url(${background});
17+
background-repeat: no-repeat;
18+
background-position: right bottom;
1919
@media (max-width: ${breakpoints.values.lg}px) {
2020
background-image: none;
2121
}
2222
@media (max-width: ${breakpoints.values.sm}px) {
23-
height: calc(100vh - ${spacing(18.375)});
2423
width: 90%;
24+
height: calc(100vh - ${spacing(18.375)});
2525
margin: 0 auto;
2626
}
2727
`;
2828

2929
export const buttonContainer = css`
30-
width: ${spacing(50)};
3130
display: flex;
3231
flex-direction: column;
3332
align-items: center;
33+
width: ${spacing(50)};
3434
margin-left: 15%;
3535
@media (max-width: ${breakpoints.values.lg}px) {
3636
margin-left: auto;
@@ -40,25 +40,25 @@ export const buttonContainer = css`
4040

4141
export const descriptionText = css`
4242
text-align: center;
43-
font-size: ${spacing(3.6)};
43+
font-size: 1.8rem;
4444
font-weight: 400;
4545
@media (max-width: ${breakpoints.values.sm}px) {
46-
font-size: ${spacing(3.2)};
46+
font-size: 1.6rem;
4747
}
4848
@media (max-width: ${breakpoints.values.xs}px) {
49-
font-size: ${spacing(3)};
49+
font-size: 1.5rem;
5050
}
5151
`;
5252

5353
export const createSessionBtn = css`
5454
display: flex;
5555
align-items: center;
56-
color: ${color.alertLight};
56+
margin-top: ${spacing(4)};
5757
padding: ${spacing(2.5)} ${spacing(3.75)};
5858
text-transform: capitalize;
59-
margin-top: ${spacing(4)};
60-
font-size: ${spacing(2.8)};
59+
font-size: 1.4rem;
6160
font-weight: 400;
61+
color: ${color.alertLight};
6262
background: linear-gradient(
6363
to right,
6464
${color.alertLight},
@@ -94,8 +94,8 @@ export const createSessionBtn = css`
9494

9595
export const arrowIcon = css`
9696
margin-left: ${spacing(1.6)};
97-
font-size: ${spacing(4)};
97+
font-size: 2rem;
9898
@media (max-width: ${breakpoints.values.xs}px) {
99-
font-size: ${spacing(3.2)};
99+
font-size: 1.6rem;
100100
}
101101
`;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ export const mainContainer = css`
1414

1515
export const studentBoard = css`
1616
box-sizing: border-box;
17-
font-size: 1rem;
1817
width: 100%;
19-
white-space: nowrap;
20-
margin-bottom: ${spacing(1.25)};
2118
margin-top: ${spacing(1.25)};
19+
margin-bottom: ${spacing(1.25)};
2220
padding: ${spacing(2)};
2321
font-family: ${typography.fontFamily};
24-
background-color: ${color.background};
22+
font-size: 1rem;
23+
white-space: nowrap;
2524
resize: none;
25+
background-color: ${color.background};
2626
border: 2px solid ${color.secondary};
2727
&:focus {
2828
outline: none;
@@ -31,15 +31,15 @@ export const studentBoard = css`
3131

3232
export const labelTextarea = css`
3333
display: block;
34-
font-size: 1.125rem;
3534
font-family: ${typography.fontFamily};
35+
font-size: 1.125rem;
3636
`;
3737

3838
export const sessionName = css`
39-
font-size: 1.125rem;
40-
text-align: center;
39+
display: inline-block;
4140
margin-bottom: ${spacing(5)};
4241
padding-bottom: ${spacing(0.625)};
42+
font-size: 1.125rem;
43+
text-align: center;
4344
border-bottom: 2px solid ${color.primary};
44-
display: inline-block;
4545
`;

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ const color = palette.customPalette;
66

77
export const headerContainer = css`
88
width: 100%;
9-
margin-bottom: ${spacing(10)};
109
margin-top: ${spacing(7.5)};
10+
margin-bottom: ${spacing(10)};
1111
`;
1212

1313
export const inputField = css`
@@ -18,29 +18,29 @@ export const inputField = css`
1818
`;
1919

2020
export const label = css`
21-
color: ${palette.text.primary};
22-
font-size: 1.125rem;
2321
font-family: ${typography.fontFamily};
22+
font-size: 1.125rem;
23+
color: ${palette.text.primary};
2424
`;
2525

2626
export const inputIconContainer = css`
27-
margin-top: ${spacing(1.25)};
2827
display: flex;
2928
align-items: center;
3029
width: 100%;
30+
margin-top: ${spacing(1.25)};
3131
`;
3232

3333
export const textArea = css`
34-
font-family: ${typography.fontFamily};
34+
flex: 1;
3535
min-width: 0;
36-
color: ${color.secondary};
3736
margin-right: 0;
37+
padding: ${spacing(2.25)};
38+
font-family: ${typography.fontFamily};
39+
font-size: 1rem;
40+
color: ${color.secondary};
3841
border: 2px solid ${color.greyMedium};
3942
border-top-left-radius: 0.4rem;
4043
border-bottom-left-radius: 0.4rem;
41-
font-size: 1rem;
42-
padding: ${spacing(2.25)};
43-
flex: 1;
4444
&:hover,
4545
&:active,
4646
&:focus {
@@ -51,8 +51,8 @@ export const textArea = css`
5151
background: ${color.greyMedium};
5252
}
5353
@media (max-width: ${breakpoints.values.xs}px) {
54-
font-size: 0.875rem;
5554
padding: ${spacing(2)};
55+
font-size: 0.875rem;
5656
}
5757
`;
5858

@@ -64,16 +64,16 @@ export const copyIcon = css`
6464
`;
6565

6666
export const copyBtn = css`
67+
width: ${spacing(7.375)};
68+
height: ${spacing(7.375)};
6769
background-color: ${color.background};
6870
border-right: 2px solid ${color.greyMedium};
6971
border-top: 2px solid ${color.greyMedium};
7072
border-bottom: 2px solid ${color.greyMedium};
7173
border-left: none;
72-
outline: none;
73-
height: ${spacing(7.375)};
74-
width: ${spacing(7.375)};
7574
border-top-right-radius: 0.4rem;
7675
border-bottom-right-radius: 0.4rem;
76+
outline: none;
7777
&:hover {
7878
cursor: pointer;
7979
background-color: ${color.greyMedium};
@@ -82,7 +82,7 @@ export const copyBtn = css`
8282
background-color: ${color.background};
8383
}
8484
@media (max-width: ${breakpoints.values.xs}px) {
85-
height: ${spacing(6.5)};
8685
width: ${spacing(6.5)};
86+
height: ${spacing(6.5)};
8787
}
8888
`;

0 commit comments

Comments
 (0)