diff --git a/src/components/AboutCard/MainCard.js b/src/components/AboutCard/MainCard.js index ad6d36ed..ef7fb886 100644 --- a/src/components/AboutCard/MainCard.js +++ b/src/components/AboutCard/MainCard.js @@ -1,6 +1,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { Typography, makeStyles, Container, Hidden } from '@material-ui/core'; +import { Typography, makeStyles, Container } from '@material-ui/core'; import SubCard from './SubCard'; const useStyles = makeStyles(theme => ({ @@ -25,11 +25,11 @@ function MainCard({ content, ...props }) { {content.about} - + <> {content.points.map(point => ( ))} - + ); } diff --git a/src/components/AboutCard/SubCard.js b/src/components/AboutCard/SubCard.js index c73306d8..ce6b0be2 100644 --- a/src/components/AboutCard/SubCard.js +++ b/src/components/AboutCard/SubCard.js @@ -1,16 +1,37 @@ import React from 'react'; -import { Grid, Typography, makeStyles, Box } from '@material-ui/core'; +import { Grid, Typography, makeStyles, Box, Hidden } from '@material-ui/core'; -const useStyles = makeStyles(theme => ({ +const useStyles = makeStyles((theme) => ({ root: { padding: 0, - paddingTop: '40px' + paddingTop: '40px', + textAlign: 'center' }, - extraMargin: { + title: { marginLeft: 15, + float: 'right', [theme.breakpoints.down('md')]: { marginLeft: 25 + }, + [theme.breakpoints.down('xs')]: { + margin: '0 auto', + float: 'none', + textAlign: 'center', + } + }, + contentTitle: { + fontWeight: 'bold', + [theme.breakpoints.down('xs')]: { + fontWeight: 'normal' + } + }, + image: { + margin: '10px auto', + display: 'inline-block', + float: 'left', + [theme.breakpoints.down('xs')]: { + float: 'none', } } })); @@ -19,18 +40,20 @@ const SubCard = ({ point }) => { const classes = useStyles(); return ( - + title-img - - + - {`${point.contentTitle} :`} - {` `} - {point.content} + {`${ point.contentTitle }`} + + + : { point.content } + diff --git a/src/views/pages/HomeView/MainCards.js b/src/views/pages/HomeView/MainCards.js index af6d68fe..77a7cc28 100755 --- a/src/views/pages/HomeView/MainCards.js +++ b/src/views/pages/HomeView/MainCards.js @@ -21,10 +21,10 @@ function MainCards({ className, ...rest }) { return ( - + - +