Skip to content

Commit 591a238

Browse files
committed
removed custom CSS and fixed MUI comps
1 parent 34c8e2c commit 591a238

File tree

2 files changed

+6
-21
lines changed

2 files changed

+6
-21
lines changed

client/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"@babel/plugin-transform-react-jsx-self": "^7.10.4",
88
"@emotion/react": "^11.13.3",
99
"@emotion/styled": "^11.13.0",
10-
"@mui/base": "^5.0.0-beta.62",
1110
"@mui/icons-material": "^5.14.19",
1211
"@mui/material": "^5.16.7",
1312
"@mui/x-date-pickers": "^7.21.0",

client/src/pages/Home.jsx

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from 'react';
22
import CheckInButtons from '../components/presentational/CheckInButtons';
33
import CreateNewProfileButton from '../components/presentational/CreateNewProfileButton';
44
import { REACT_APP_CUSTOM_REQUEST_HEADER as headerToSend } from '../utils/globalSettings';
5-
import { CircularProgress, Box, Typography, Select, MenuItem, FormControl } from '@mui/material';
5+
import { CircularProgress, Box, Typography, Select, MenuItem, FormControl, InputLabel } from '@mui/material';
66

77
import '../sass/Home.scss';
88

@@ -25,20 +25,6 @@ const h4sx = {
2525
fontSize: {xs: '1.8rem'},
2626
}
2727

28-
// CSS for MUI label
29-
const labelsx = {
30-
fontFamily: 'aliseoregular',
31-
fontSize: 18,
32-
}
33-
34-
// CSS for MUI MenuItem
35-
const menuItemSx = {
36-
width: '100%',
37-
fontSize: 18,
38-
color: 'rgb(250, 17, 79)',
39-
backgroundColor: 'inhert',
40-
}
41-
4228

4329
const Home = () => {
4430
const [events, setEvents] = useState(null);
@@ -95,12 +81,12 @@ const Home = () => {
9581
>
9682
<Box className="form-row">
9783
<Box className="form-input-select">
98-
<Typography sx={labelsx}>
84+
<InputLabel id='select-meeting-label'>
9985
Select a meeting to check-in:
100-
</Typography>
86+
</InputLabel>
10187
<Box className="radio-buttons">
10288
<Select
103-
labelId='select-label'
89+
labelId='select-meeting-label'
10490
className="select-meeting-dropdown"
10591
value={selectedEvent ? selectedEvent : "--SELECT ONE--"}
10692
renderValue={(selected) => (
@@ -112,8 +98,8 @@ const Home = () => {
11298
>
11399
{events.map((event) => {
114100
return (
115-
<MenuItem key={event._id || 0} value={event.project?.name + ' - ' + event.name} sx={menuItemSx}>
116-
<Typography sx={menuItemSx}>
101+
<MenuItem key={event._id || 0} value={event.project?.name + ' - ' + event.name}>
102+
<Typography>
117103
{event?.project?.name + ' - ' + event.name}
118104
</Typography>
119105
</MenuItem>

0 commit comments

Comments
 (0)