Skip to content

Commit cf60654

Browse files
committed
style fixes for responsiveness
1 parent 2fdab38 commit cf60654

7 files changed

Lines changed: 64 additions & 14 deletions

File tree

client/src/components/button/ButtonOutlined/ButtonOutlined.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
border-image-repeat: repeat;
3232
position: relative;
3333
min-width: 200px;
34+
min-height: 100px;
3435

3536
padding: 10px 26px;
3637

@@ -39,7 +40,7 @@
3940
font-family: 'Jersey 20', sans-serif;
4041
}
4142
h2 {
42-
font-size: 12px;
43+
font-size: 18px;
4344
}
4445

4546
@include devices(tablet) {

client/src/components/buttonSelector/buttonSelector/ButtonSelector.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const ButtonSelector = ({
2020
<ButtonOutlined
2121
key={index}
2222
onClick={() => setActiveButton(index)}
23-
label={item.title}
23+
label={item.name}
2424
sub={item.sub}
2525
style={{
2626
// backgroundColor: `${item.buttonColor}`,

client/src/components/schedule/ScheduleHome/ScheduleHome.jsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const ScheduleComponent = () => {
3232
const buttonList = Object.keys(data).map((item, index) => {
3333
const dayOfWeek = item.split(' ')[0];
3434
const date = item.split(' ')[1] + ' ' + item.split(' ')[2];
35-
return { name: item, title: dayOfWeek, sub: date };
35+
return { name: dayOfWeek, title: dayOfWeek, sub: date };
3636
});
3737

3838
return (
@@ -151,8 +151,13 @@ export const ScheduleComponentAccordion = ({ scheduleDay, closeAll }) => {
151151
) : (
152152
<></>
153153
)}
154+
<h2 className="eventtimemobile">
155+
{startTime === ' ' && endTime === ' ' ? '' : `${startTime} - ${endTime}`}
156+
</h2>
154157
</div>
155-
<h2>{startTime === ' ' && endTime === ' ' ? '' : `${startTime} - ${endTime}`}</h2>
158+
<h2 className="eventtimedesktop">
159+
{startTime === ' ' && endTime === ' ' ? '' : `${startTime} - ${endTime}`}
160+
</h2>
156161
</div>
157162
}
158163
setIsOpen={setIsOpen}

client/src/components/schedule/ScheduleHome/ScheduleHome.scss

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,11 @@
171171
font-size: 24px;
172172
padding: 15px 5px;
173173
@include devices(tablet) {
174-
font-size: 20px;
175-
padding: 10px 0px;
174+
// font-size: 20px;
175+
// padding: 10px 0px;
176+
margin-bottom: 0px !important;
177+
padding-bottom: 0px !important;
178+
font-weight: 900;
176179
}
177180
// color: var(--text-dark);
178181
}
@@ -182,8 +185,9 @@
182185
// color: var(--gray-time-label);
183186
text-align: right;
184187
@include devices(tablet) {
185-
font-size: 15px;
186-
padding: 5px 0px;
188+
// font-size: 30px;
189+
// padding: 5px 0px;
190+
font-weight: 700;
187191
}
188192
}
189193
p {
@@ -206,24 +210,61 @@
206210
justify-content: space-between;
207211
align-items: center;
208212
flex-direction: row;
213+
214+
@include devices(tablet) {
215+
align-items: center;
216+
justify-content: center;
217+
flex-direction: column;
218+
}
219+
}
220+
221+
.eventtimedesktop {
222+
@include devices(tablet) {
223+
display: none;
224+
}
209225
}
226+
227+
.eventtimemobile {
228+
@media (min-width: 767px) {
229+
display: none;
230+
}
231+
margin-left: 0px !important;
232+
margin-bottom: 10px;
233+
padding-top: 5px !important;
234+
}
235+
210236
.schedule-accordion-header {
211237
display: flex;
212238
align-items: flex-start;
213239
justify-content: space-between;
214240
flex-direction: column;
215241
user-select: none;
242+
243+
@include devices(tablet) {
244+
align-items: center;
245+
justify-content: center;
246+
}
216247
}
217248
.schedule-accordion-location {
218249
// color: var(--gray-time-label);
219250
margin-bottom: 10px;
220251
font-size: 16px;
252+
253+
@include devices(tablet) {
254+
display: none;
255+
}
221256
}
222257
.schedule-accordion-header-location-icon {
223258
width: 14px;
224259
height: 14px;
225260
margin-top: 3px;
226261
margin-right: 3px;
262+
263+
@include devices(tablet) {
264+
visibility: hidden;
265+
width: 10px;
266+
height: 10px;
267+
}
227268
}
228269
.schedule-accordion-header-location-container {
229270
display: flex;

client/src/pages/FAQ/FAQ.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@
314314
.faq-search-result-answer-accordion {
315315
margin-top: 7px;
316316
border-radius: 12px;
317-
color: var(--text-inverted);
317+
color: var(--lilac);
318318
@include devices(tablet) {
319319
font-size: 16px;
320320
}
@@ -330,7 +330,7 @@
330330
.faq-no-results {
331331
width: 100%;
332332
text-align: center;
333-
color: var(--text-dynamic);
333+
color: var(--text-primary);
334334
}
335335

336336
.pagination-controls {
@@ -355,7 +355,7 @@
355355

356356
&.active {
357357
background-color: var(--monster);
358-
color: var(--text-inverted);
358+
color: var(--mikado);
359359
}
360360
}
361361
}

client/src/pages/Home/Home.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@
9191
padding: 0px 25px;
9292

9393
h1 {
94-
font-size: 150px;
94+
font-size: 120px;
9595
text-align: right;
96+
margin: 0px 0px 0px 0px;
9697
}
9798

9899
h2 {

client/src/util/colors.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ export const colors = {
44
'--bg-secondary': ['#EBEBEB', '#382159'],
55
'--neutral-secondary': ['#EBEBEB', '#2E194C'],
66
'--text-primary': ['#000000', '#FFFFFF'],
7-
'--text-inverted': ['#e9dff5', '#000000'],
7+
'--text-inverted': ['#E9DFF5', '#000000'],
88
'--text-secondary': ['#5E5E5E', '#DFCDF3'],
99
'--vignette': ['#00000040', '#00000040'],
1010
'--link-dynamic': ['#A77AD7', '#FFC600'],
@@ -19,6 +19,8 @@ export const colors = {
1919
'--dusk': ['#EBEBEB', '#EBEBEB'],
2020
'--dawn': ['#3C3C3C', '#3C3C3C'],
2121

22+
'--lilac': ['#E9DFF5', '#E9DFF5'],
23+
2224
// 2T5 Schedule Colours
2325
'--sc-general': ['#711F8B', '#711F8B'],
2426
'--sc-long': ['#FFC600', '#FFC600'],
@@ -66,7 +68,7 @@ export const colors = {
6668
'--text-light': ['#f3f3f3', '#f3f3f3'],
6769
'--text-dynamic': ['#20002e', '#f3f3f3'],
6870
'--text-muted': ['#696969', '#696969'],
69-
'--page-bg': ['#efe9f8', '#382159'],
71+
'--page-bg': ['#FFFFFF', '#291742'],
7072
'--purple-transparent': ['#7b33a8d6', '#793DA1B8'],
7173
'--purple-transparent-more': ['#7b33a830', '#79409F58'],
7274
'--transparent': ['#00000000', '#00000000'],

0 commit comments

Comments
 (0)