Defect/ncippe 223--public-content (#15)

* update footer logo * render card description with markdown * adjust footer logo size
CBIIT · Dec 11, 2019 · 58d20a3 · 58d20a3
1 parent 018f4b7
commit 58d20a3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/public/assets/images/nci-logo-text-white.svg b/public/assets/images/nci-logo-text-white.svg
diff --git a/src/components/IconCardMedia/IconCardMedia.js b/src/components/IconCardMedia/IconCardMedia.js
@@ -4,6 +4,9 @@ import { Button, Card, CardActions, CardMedia, CardContent, Typography } from '@
 import { makeStyles } from '@material-ui/core/styles'
 import { KeyboardArrowRight as KeyboardArrowRightIcon } from '@material-ui/icons'
 
+import RenderContent from '../utils/RenderContent'
+
+
 const useStyles = makeStyles( theme => ({
   root: {
     height: '100%',
@@ -42,7 +45,7 @@ const Component = (props) => {
           </Typography>
           {desc &&
             <Typography component="p">
-              {desc}
+              <RenderContent source={desc} />
             </Typography>
           }
         </CardContent>

diff --git a/src/components/region/Footer/Footer.js b/src/components/region/Footer/Footer.js
@@ -16,8 +16,9 @@ const useStyles = makeStyles(theme => ({
     }
   },
   logo: {
+    padding: theme.spacing(2,0),
     '& img': {
-      width: '430px',
+      width: '320px',
       maxWidth: '100%',
       height: 'auto'
     }
@@ -63,7 +64,7 @@ const Footer = () => {
 
   return (
     <Container className={classes.root} component="footer">
-      <div className={classes.logo}><img src={`/${process.env.PUBLIC_URL}assets/images/nci-logo-white.svg`} alt={t('footer.logo.alt_text')} title={t('footer.logo.title')}  /></div>
+      <div className={classes.logo}><img src={`/${process.env.PUBLIC_URL}assets/images/nci-logo-text-white.svg`} alt={t('footer.logo.alt_text')} title={t('footer.logo.title')}  /></div>
       <Typography component="div">
         <Grid container className={classes.footerLinks} spacing={3} onClick={trackClick}>
           <Grid item xs={12} sm={4}>