Merge branch 'master' of github.com:fus-marcom/franciscan-react

fus-marcom · Oct 15, 2018 · 30bef05 · 30bef05
2 parents 90dafbe + ee19665
commit 30bef05
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/pages/index.js b/pages/index.js
@@ -40,10 +40,20 @@ const IndexPage = ({ classes }) => (
       textColor="#fff"
       borderColor="#998643"
       padding="12px 0"
+      btnLink="/about/vision-charisms"
+      btnText="Read Our Vision and Charisms"
+      darkBg={true}
     />
 
     <Grid container className={classes.contentContainer}>
       <Grid item className={classes.gridItemFix} xs={12}>
+        <Typography
+          variant="display2"
+          gutterBottom
+          style={{ textAlign: 'center' }}
+        >
+          Be Singular
+        </Typography>
         <Card className={`${classes.card} ${classes.videoIframeContainer}`}>
           <iframe
             className={classes.videoIframe}

diff --git a/server.js b/server.js
@@ -283,6 +283,11 @@ const translationObj = {
     type: 'studentLifePages',
     id: { default: 'counseling-services' }
   },
+  'alumni-outcomes': {
+    page: '/page',
+    type: 'alumniOutcomes',
+    id: { default: 'alumni-outcomes' }
+  },
   pilgrimages: {
     page: '/page',
     type: 'pilgrimagesPages',