Skip to content

Commit d301e76

Browse files
committed
Приглашение экспертов: исправление стилей
1 parent 625164f commit d301e76

File tree

2 files changed

+20
-35
lines changed

2 files changed

+20
-35
lines changed

hwproj.front/src/components/Experts/Notebook.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,8 @@ const ExpertsNotebook: FC = () => {
231231
</Grid>
232232
<Grid item justify-content={"flex-to-end"}>
233233
<FormControlLabel
234-
control={<Checkbox size="small" onChange={handleAllExpertsSelection}/>}
234+
control={<Checkbox size="small" color={"primary"}
235+
onChange={handleAllExpertsSelection}/>}
235236
label="Показать всех"/>
236237
</Grid>
237238
</Grid>

hwproj.front/src/components/Experts/RegisterModal.tsx

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Dialog, DialogTitle, DialogContent, DialogActions} from "@mui/material";
44
import Button from "@material-ui/core/Button";
55
import Typography from "@material-ui/core/Typography";
66
import ApiSingleton from "../../api/ApiSingleton";
7-
import {RegisterExpertViewModel} from "../../api/";
7+
import {RegisterExpertViewModel} from "@/api";
88
import "../Auth/Styles/Register.css";
99
import Grid from "@material-ui/core/Grid";
1010
import {makeStyles} from '@material-ui/core/styles';
@@ -35,10 +35,7 @@ const useStyles = makeStyles((theme) => ({
3535
form: {
3636
marginTop: theme.spacing(3),
3737
width: '100%'
38-
},
39-
button: {
40-
marginTop: theme.spacing(1)
41-
},
38+
}
4239
}))
4340

4441
const RegisterExpertModal: FC<IRegisterExpertProps> = (props) => {
@@ -108,7 +105,8 @@ const RegisterExpertModal: FC<IRegisterExpertProps> = (props) => {
108105

109106
return (
110107
<div>
111-
<Dialog open={props.isOpen} onClose={handleClose} aria-labelledby="form-dialog-title" maxWidth="xs">
108+
<Dialog open={props.isOpen} onClose={() => handleClose(false)} aria-labelledby="form-dialog-title"
109+
maxWidth="xs">
112110
<DialogTitle id="form-dialog-title">
113111
<Grid container>
114112
<Grid item container direction={"row"} justifyContent={"center"}>
@@ -235,37 +233,23 @@ const RegisterExpertModal: FC<IRegisterExpertProps> = (props) => {
235233
/>
236234
</Grid>
237235
</Grid>
238-
<Grid
239-
direction="row"
240-
justifyContent="flex-end"
241-
alignItems="flex-end"
242-
container
243-
style={{marginTop: '16px'}}
244-
>
245-
<Grid item>
246-
<Button
247-
onClick={() => handleClose(false)}
248-
color="primary"
249-
variant="contained"
250-
style={{marginRight: '10px'}}
251-
>
252-
Закрыть
253-
</Button>
254-
</Grid>
255-
<Grid item>
256-
<Button
257-
fullWidth
258-
variant="contained"
259-
color="primary"
260-
type="submit"
261-
>
262-
Зарегистрировать
263-
</Button>
264-
</Grid>
265-
</Grid>
266236
</form>
267237
</DialogContent>
268238
<DialogActions>
239+
<Button
240+
variant="contained"
241+
color="primary"
242+
type="submit"
243+
>
244+
Зарегистрировать
245+
</Button>
246+
<Button
247+
onClick={() => handleClose(false)}
248+
color="primary"
249+
variant="text"
250+
>
251+
Закрыть
252+
</Button>
269253
</DialogActions>
270254
</Dialog>
271255
</div>

0 commit comments

Comments
 (0)