Merge branch 'master' into customer/perfect-gourmet

FoxComm · Jan 6, 2017 · 8660df5 · 8660df5
2 parents 43ae712 + a0fb4fa
commit 8660df5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/components/auth/auth.jsx b/src/components/auth/auth.jsx
@@ -28,6 +28,7 @@ class Auth extends Component {
     const authProps = {
       getPath: this.getPath,
       path: this.props.path,
+      mergeGuestCart: true,
     };
 
     switch (this.props.authBlockType) {

diff --git a/src/pages/home/home-page.jsx b/src/pages/home/home-page.jsx
@@ -14,9 +14,9 @@ import styles from './home-page.css';
 const mainBlocks = [
   {
     imageUrl: '/images/home-page/Home_Page_Holidays_NEW_2x.jpg',
-    description: 'We’ve got you covered',
-    title: 'Entertaining for the holidays?',
-    action: { title: 'Shop holiday picks', link: '/holiday' },
+    description: '',
+    title: 'Make Every Day A Reason to Celebrate',
+    action: { title: 'Shop Entrées', link: '/ENTRÉES' },
   },
   {
     imageUrl: '/images/home-page/Home_Page_Favorites_2x.jpg',