Skip to content
Snippets Groups Projects
Commit 26d42071 authored by Stephanie Briere Americo's avatar Stephanie Briere Americo
Browse files

Merge branch 'issue/20' into 'development'

Issue/20

See merge request !20
parents 9a10ccf2 b7762c47
Branches
No related tags found
3 merge requests!58Version 1.1,!54Issue #53: Fix password info,!20Issue/20
...@@ -100,7 +100,11 @@ function FormFieldCheckbox(props) { ...@@ -100,7 +100,11 @@ function FormFieldCheckbox(props) {
const options = props.options.map((x, index) => { const options = props.options.map((x, index) => {
return ( return (
<span> <span>
<Typography className={classes.text} variant="h7"> <Typography
style={{ wordWrap: "break-word" }}
className={classes.text}
variant="h7"
>
{x.value} {x.value}
</Typography> </Typography>
<Checkbox onChange={() => handleArray(index)} /> <Checkbox onChange={() => handleArray(index)} />
...@@ -117,10 +121,16 @@ function FormFieldCheckbox(props) { ...@@ -117,10 +121,16 @@ function FormFieldCheckbox(props) {
<Paper className={classes.paper}> <Paper className={classes.paper}>
<Grid container> <Grid container>
<Grid item xs={12} className={classes.questionsGrid}> <Grid item xs={12} className={classes.questionsGrid}>
<Typography className={classes.text} variant="h6"> <Typography
style={{ wordWrap: "break-word" }}
className={classes.text}
variant="h6"
>
{props.question} {props.question}
</Typography> </Typography>
<Typography variant="h8">{props.description}</Typography> <Typography style={{ wordWrap: "break-word" }} variant="h8">
{props.description}
</Typography>
</Grid> </Grid>
<Grid <Grid
item item
...@@ -133,7 +143,12 @@ function FormFieldCheckbox(props) { ...@@ -133,7 +143,12 @@ function FormFieldCheckbox(props) {
> >
{options} {options}
<div> <div>
<Typography className={classes.validation}>{valid}</Typography> <Typography
style={{ wordWrap: "break-word" }}
className={classes.validation}
>
{valid}
</Typography>
</div> </div>
</Grid> </Grid>
</Grid> </Grid>
......
...@@ -111,7 +111,11 @@ function FormFieldRadio(props) { ...@@ -111,7 +111,11 @@ function FormFieldRadio(props) {
const options = props.options.map(function(x, index) { const options = props.options.map(function(x, index) {
return ( return (
<span> <span>
<Typography className={classes.text} variant="h7"> <Typography
style={{ wordWrap: "break-word" }}
className={classes.text}
variant="h7"
>
{x.value} {x.value}
</Typography> </Typography>
<Radio <Radio
...@@ -133,10 +137,16 @@ function FormFieldRadio(props) { ...@@ -133,10 +137,16 @@ function FormFieldRadio(props) {
<Paper className={classes.paper}> <Paper className={classes.paper}>
<Grid container> <Grid container>
<Grid item xs={12} className={classes.questionsGrid}> <Grid item xs={12} className={classes.questionsGrid}>
<Typography className={classes.text} variant="h6"> <Typography
style={{ wordWrap: "break-word" }}
className={classes.text}
variant="h6"
>
{props.question} {props.question}
</Typography> </Typography>
<Typography variant="h8">{props.description}</Typography> <Typography style={{ wordWrap: "break-word" }} variant="h8">
{props.description}
</Typography>
</Grid> </Grid>
<Grid <Grid
item item
...@@ -149,7 +159,12 @@ function FormFieldRadio(props) { ...@@ -149,7 +159,12 @@ function FormFieldRadio(props) {
> >
<RadioGroup> <RadioGroup>
{options} {options}
<Typography className={classes.validation}>{valid}</Typography> <Typography
style={{ wordWrap: "break-word" }}
className={classes.validation}
>
{valid}
</Typography>
</RadioGroup> </RadioGroup>
</Grid> </Grid>
</Grid> </Grid>
......
...@@ -122,10 +122,18 @@ function FormFieldSelect(props) { ...@@ -122,10 +122,18 @@ function FormFieldSelect(props) {
<Paper className={classes.paper}> <Paper className={classes.paper}>
<Grid container> <Grid container>
<Grid item xs={12} className={classes.questionsGrid}> <Grid item xs={12} className={classes.questionsGrid}>
<Typography className={classes.text} variant="h6"> <Typography
style={{ wordWrap: "break-word" }}
className={classes.text}
variant="h6"
>
{props.question} {props.question}
</Typography> </Typography>
<Typography variant="h8" gutterBottom> <Typography
style={{ wordWrap: "break-word" }}
variant="h8"
gutterBottom
>
{props.description} {props.description}
</Typography> </Typography>
</Grid> </Grid>
...@@ -145,7 +153,12 @@ function FormFieldSelect(props) { ...@@ -145,7 +153,12 @@ function FormFieldSelect(props) {
> >
{options} {options}
</Select> </Select>
<Typography className={classes.validation}>{valid}</Typography> <Typography
style={{ wordWrap: "break-word" }}
className={classes.validation}
>
{valid}
</Typography>
</Grid> </Grid>
</Grid> </Grid>
</Paper> </Paper>
......
...@@ -99,10 +99,16 @@ function FormFieldText(props) { ...@@ -99,10 +99,16 @@ function FormFieldText(props) {
<Paper className={classes.paper}> <Paper className={classes.paper}>
<Grid container> <Grid container>
<Grid item xs={12} className={classes.questionsGrid}> <Grid item xs={12} className={classes.questionsGrid}>
<Typography className={classes.text} variant="h6"> <Typography
style={{ wordWrap: "break-word" }}
className={classes.text}
variant="h6"
>
{props.question} {props.question}
</Typography> </Typography>
<Typography variant="h8">{props.description}</Typography> <Typography style={{ wordWrap: "break-word" }} variant="h8">
{props.description}
</Typography>
</Grid> </Grid>
<Grid item xs={9} className={classes.questionsGrid}> <Grid item xs={9} className={classes.questionsGrid}>
<TextField <TextField
...@@ -112,7 +118,12 @@ function FormFieldText(props) { ...@@ -112,7 +118,12 @@ function FormFieldText(props) {
placeholder="Resposta" placeholder="Resposta"
onChange={handleChange} onChange={handleChange}
/> />
<Typography className={classes.validation}>{valid}</Typography> <Typography
style={{ wordWrap: "break-word" }}
className={classes.validation}
>
{valid}
</Typography>
</Grid> </Grid>
<Grid <Grid
item item
......
import React from 'react'; import React from "react";
import { makeStyles } from '@material-ui/core/styles'; import { makeStyles } from "@material-ui/core/styles";
import Grid from '@material-ui/core/Grid'; import Grid from "@material-ui/core/Grid";
import Paper from '@material-ui/core/Paper'; import Paper from "@material-ui/core/Paper";
import Typography from '@material-ui/core/Typography'; import Typography from "@material-ui/core/Typography";
import FieldFooterOptions from './FieldFooterOptions'; import FieldFooterOptions from "./FieldFooterOptions";
const useStyles = makeStyles(theme => ({ const useStyles = makeStyles(theme => ({
paper: { paper: {
...@@ -12,7 +12,7 @@ const useStyles = makeStyles(theme => ({ ...@@ -12,7 +12,7 @@ const useStyles = makeStyles(theme => ({
width: theme.spacing(100), width: theme.spacing(100),
height: theme.spacing(22), height: theme.spacing(22),
margin: theme.spacing(2), margin: theme.spacing(2),
color: '#000000', color: "#000000",
["@media (max-width:827px)"]: { ["@media (max-width:827px)"]: {
width: theme.spacing(70) width: theme.spacing(70)
}, },
...@@ -21,32 +21,32 @@ const useStyles = makeStyles(theme => ({ ...@@ -21,32 +21,32 @@ const useStyles = makeStyles(theme => ({
} }
}, },
questionsGrid: { questionsGrid: {
marginBottom: '20px', marginBottom: "20px",
color: '#000000', color: "#000000",
["@media (max-width:827px)"]: { ["@media (max-width:827px)"]: {
width: theme.spacing(70) width: theme.spacing(70)
} }
}, },
title: { title: {
fontSize: '45px', fontSize: "45px",
color: '#000000', color: "#000000",
["@media (max-width:827px)"]: { ["@media (max-width:827px)"]: {
fontSize: '35px' fontSize: "35px"
}, },
["@media (max-width:590px)"]: { ["@media (max-width:590px)"]: {
fontSize: '25px' fontSize: "25px"
} }
}, },
description: { description: {
fontSize: '30px', fontSize: "30px",
color: '#000000', color: "#000000",
["@media (max-width:827px)"]: { ["@media (max-width:827px)"]: {
fontSize: '25px' fontSize: "25px"
}, },
["@media (max-width:590px)"]: { ["@media (max-width:590px)"]: {
fontSize: '15px' fontSize: "15px"
}
} }
},
})); }));
function FormFieldText(props) { function FormFieldText(props) {
...@@ -57,27 +57,37 @@ function FormFieldText(props) { ...@@ -57,27 +57,37 @@ function FormFieldText(props) {
<Paper className={classes.paper}> <Paper className={classes.paper}>
<Grid container> <Grid container>
<Grid item xs={12} className={classes.questionsGrid}> <Grid item xs={12} className={classes.questionsGrid}>
<Typography className={classes.title} variant="h3" gutterBottom> <Typography
style={{ wordWrap: "break-word" }}
className={classes.title}
variant="h3"
gutterBottom
>
{props.title} {props.title}
</Typography> </Typography>
</Grid> </Grid>
<Grid item xs={9} className={classes.questionsGrid}> <Grid item xs={9} className={classes.questionsGrid}>
<Typography className={classes.description} variant="h4" gutterBottom> <Typography
style={{ wordWrap: "break-word" }}
className={classes.description}
variant="h4"
gutterBottom
>
{props.description} {props.description}
</Typography> </Typography>
</Grid> </Grid>
<Grid item container <Grid
item
container
direction="row" direction="row"
justify="flex-end" justify="flex-end"
alignItems="flex-end" alignItems="flex-end"
xs={3} xs={3}
> ></Grid>
</Grid>
</Grid> </Grid>
</Paper> </Paper>
</Grid> </Grid>
); );
} }
export default FormFieldText; export default FormFieldText;
...@@ -97,7 +97,7 @@ function CardForm(props) { ...@@ -97,7 +97,7 @@ function CardForm(props) {
return ( return (
<ExpansionPanel> <ExpansionPanel>
<ExpansionPanelSummary expandIcon={<MoreVertOutlinedIcon />}> <ExpansionPanelSummary expandIcon={<MoreVertOutlinedIcon />}>
<Typography className={classes.title}> <Typography noWrap className={classes.title}>
{props.title} {props.title}
<br /> <br />
<div className={classes.create} noWrap> <div className={classes.create} noWrap>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment