From cd86313764f7f6b4b40b7e3f73b4fb2c4d9bbb65 Mon Sep 17 00:00:00 2001 From: carloswiggan Date: Tue, 25 Dec 2018 10:51:52 -0700 Subject: [PATCH 1/3] circular --- client/src/components/Application.js | 2 + client/src/components/HeroCTA.js | 2 +- .../components/Informational/Collaboration.js | 46 +- .../src/stylesheets/components/_Footer.scss | 1 + .../src/stylesheets/components/_HeroCTA.scss | 4 + client/src/stylesheets/components/_info.scss | 99 +- client/yarn.lock | 1236 +++++++++ yarn.lock | 2452 +++++++++++------ 8 files changed, 2995 insertions(+), 847 deletions(-) diff --git a/client/src/components/Application.js b/client/src/components/Application.js index 4e704008..1cb5507e 100644 --- a/client/src/components/Application.js +++ b/client/src/components/Application.js @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import NavBar from '../components/Navigation/Navbar'; +import Footer from '../components/Footer/Footer'; const Application = ({ auth, @@ -22,6 +23,7 @@ const Application = ({ {...props} /> {props.children} +