Merge pull request #31 from BootcampersCollective/home-#4

Home #4
BootcampersCollective · Jul 29, 2017 · 93f60d1 · 93f60d1
2 parents d670b83 + db59727
commit 93f60d1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,6 +1,6 @@
 module.exports = function (grunt) {
     'use strict';
-    
+
     grunt.initConfig({
         clean: [
             'public/images/*',
@@ -91,4 +91,4 @@ module.exports = function (grunt) {
 	    'concat:angular',
         'sass'
     ]);
-};
+};
diff --git a/client/app/home/components/home.component.js b/client/app/home/components/home.component.js
@@ -11,7 +11,10 @@ const home = {
 		};
 		ctrl.$postLink = function () {};
 	},
-	template: `<h1 class="home-title">{{$ctrl.title}}</h1>`
+	template: `
+		
+	`
+
 };
 
 angular.module('5340-site.home')

diff --git a/client/app/layout/layout/layout.componet.js → client/app/layout/layout/layout.component.js b/client/app/layout/layout/layout.componet.js → client/app/layout/layout/layout.component.js
diff --git a/client/assets/Images/coffee_outside.jpg b/client/assets/Images/coffee_outside.jpg
diff --git a/client/sass/layout/layout.scss b/client/sass/layout/layout.scss
@@ -1,4 +1,9 @@
 .container-main {
+  background-image: url("/images/coffee_outside.jpg");
+  background-repeat: no-repeat;
+  background-size: cover;
+
+  z-index:-1;
   display: flex;
   flex-direction: column;
   flex-wrap: nowrap;

diff --git a/client/sass/pages/home.scss b/client/sass/pages/home.scss
@@ -1,2 +1,3 @@
 h1.home-title{
+ // NOTE: Removed because logo has the title
 }