Merge branch 'master' into JoeFrontPage

joeblas · Nov 22, 2017 · 2e3d9bd · 2e3d9bd
2 parents 79d3a4c + 6e1c9fb
commit 2e3d9bd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/imports/ui/components/Footer/Footer.js b/imports/ui/components/Footer/Footer.js
@@ -14,6 +14,13 @@ const Footer = () => (
   <div className="Footer">
     <Grid>
       <p className="pull-left">&copy; {copyrightYear()} CloudControl, LLC</p>
+      <div className="pull-right">
+        <a href="https://github.com/hads17">Bradley S. | </a>
+        <a href="https://github.com/bahrtender3">Dustin Bahr | </a>
+        <a href="https://github.com/ethanzander">Ethan Zander | </a>
+        <a href="https://github.com/joeblas">Joe Blas | </a>
+        <a href="https://github.com/tylern88">Tyler Negro</a>
+      </div>
     </Grid>
   </div>
 );

diff --git a/imports/ui/components/Footer/Footer.scss b/imports/ui/components/Footer/Footer.scss
@@ -1,6 +1,8 @@
 @import '../../stylesheets/mixins';
 @import '../../stylesheets/colors';
 
+
+
 html {
   position: relative;
   min-height: 100%;
@@ -36,14 +38,13 @@ body {
     }
 
     a {
-      color: $gray-light;
+      color: white;
     }
 
     a:hover,
     a:active,
     a:focus {
-      text-decoration: none;
-      color: $gray;
+      color: white;
     }
   }
 }

diff --git a/imports/ui/pages/Index/Index.js b/imports/ui/pages/Index/Index.js
@@ -12,6 +12,7 @@ bootstrapUtils.addStyle(Jumbotron, 'custom');
 
 const Index = () => (
   <div>
+
  <style type="text/css">{`
  .jumbotron-custom {
      background-color: white;
@@ -34,6 +35,8 @@ const Index = () => (
     </Row>
   <div className="Index">
   </div>
+
+
   </div>
 );
 

diff --git a/imports/ui/stylesheets/bootstrap-overrides.scss b/imports/ui/stylesheets/bootstrap-overrides.scss
@@ -10,3 +10,7 @@
     margin-top: 20px;
   }
 }
+
+a {
+  color: white;
+}