From a2b763e00db814ea9ca941f08ae2660a87b8f845 Mon Sep 17 00:00:00 2001
From: Matan Bar Yosef <baryosef.matan@gmail.com>
Date: Thu, 18 Jun 2015 21:13:31 +0300
Subject: [PATCH] - feed design Fixed

---
 templates/css/theme.css                    | 94 +++++++++++++++-------
 templates/js/controllers/homeController.js | 14 ----
 templates/views/home.html                  | 58 +++++--------
 3 files changed, 87 insertions(+), 79 deletions(-)

diff --git a/templates/css/theme.css b/templates/css/theme.css
index b132759..ed28d11 100644
--- a/templates/css/theme.css
+++ b/templates/css/theme.css
@@ -76,28 +76,21 @@ body.noscroll
   margin-top: 1em;
   margin-right: 1em;
   position: center;
-
   -webkit-border-radius: 30%;
   -moz-border-radius: 30%;
   border-radius: 30%;
-
-
 }
 
-/*.avatar {
-  background: rgba(0, 0, 0, 0.2);
-  }*/
-
-  .avatar img {
-    border-radius: 40px;
-    position:center;
-    width: 80px;
-    height: 80px;
-    margin: 6px;  /*centers the image in the parent element */
-    -webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
-    -moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
-    box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
-  }
+.avatar img {
+  border-radius: 40px;
+  position:center;
+  width: 80px;
+  height: 80px;
+  margin: 6px;  /*centers the image in the parent element */
+  -webkit-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
+  -moz-box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
+  box-shadow: 2px 2px 5px 0px rgba(0,0,0,0.75);
+}
 
   /* Added BY devMatan */
 
@@ -111,14 +104,8 @@ body.noscroll
  
   }*/
 
-  .campusAvatar img
-  {
-/*
-  margin-top: 1em;
-  margin-right: 1em;
-  position: center;
-  */
-
+.campusAvatar img
+{
   border-radius: 40px;
   position:center;
   width: 80px;
@@ -162,6 +149,26 @@ body.noscroll
   /*TODO*/
 }
 
+.feed
+{
+  overflow-y: scroll;
+  height: 300px;
+  /*width: 100%;*/
+}
+
+.feedMessages
+{
+  overflow: scroll;
+  height: 300px;
+  width: 100%;
+}
+.feedTasks
+{
+  overflow: scroll;
+  height: 300px;
+  width: 100%;
+}
+
 .feedContent
 {
   padding-left: 6%;
@@ -181,7 +188,6 @@ body.noscroll
   border-radius: 150px;
   -webkit-border-radius: 150px;
   -moz-border-radius: 150px;
-  /*background: url(http://i61.tinypic.com/v86f7.png) no-repeat;*/
   box-shadow: 0 0 8px rgba(0, 0, 0, .8);
   -webkit-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
   -moz-box-shadow: 0 0 8px rgba(0, 0, 0, .8);
@@ -302,7 +308,6 @@ body.noscroll
   .user-box img{
     width: 100%;
     border: 4px #7f7f7f solid;
-
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -351,6 +356,41 @@ body.noscroll
   }
 
 
+/*gridList Effects*/
+
+md-grid-list {
+  margin: 8px; }
+.gray{
+  background:#f5f5f5;
+
+}
+
+.aliceblue {
+  background: aliceblue; 
+}
+  .green {
+  background: #b9f6ca;
+}
+  .yellow {
+  background: #ffff8d;
+}
+  .blue {
+  background: #84ffff;
+}
+  .purple {
+  background: #b388ff;
+}
+  .red {
+  background: #ff8a80;
+}
+  md-grid-tile {
+  transition: all 400ms ease-out 50ms;
+}
+
+/*END gridList Effects*/
+
+
+
 /*  md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button {
   font-size: inherit;
   height: inherit;
diff --git a/templates/js/controllers/homeController.js b/templates/js/controllers/homeController.js
index 009a4f5..573dab3 100644
--- a/templates/js/controllers/homeController.js
+++ b/templates/js/controllers/homeController.js
@@ -8,20 +8,6 @@ angular.module('SeHub')
     ];
 
     $scope.messages = [
-      {
-        face : imagePath,
-        what: 'I need to go to luna-park',
-        who: 'Matan Bar Yosef',
-        when: '3:08PM',
-        notes: " Lets do something"
-      },
-      {
-        face : imagePath,
-        what: 'Lets Lets Lets',
-        who: 'Matan Bar Yosef',
-        when: '4:33PM',
-        notes: " Lets go drink something"
-      },
       {
         face : imagePath,
         what: 'Let me tell you a secret',
diff --git a/templates/views/home.html b/templates/views/home.html
index 7b2fc30..65dabb3 100644
--- a/templates/views/home.html
+++ b/templates/views/home.html
@@ -24,45 +24,27 @@
 	</md-content>
 	<md-content layout-padding>
 		<md-card>
-		<div class = "feed" ><!--  layout-align="center center"> -->
-			<div>
-				<md-subheader class="md-no-sticky" style = "background-color:aliceblue; margin-right:0;">Messages</md-subheader>
-				<md-list-item class="md-3-line" ng-repeat="item in messages">
-					<div class="md-list-item-text" style="border: 1px solid black;">
-						<img ng-src="{{user.avatar_url}}" class="roundUserAvatar" alt="{{item.who}}" style="margin:8px"/> 
-						<!-- Instead of "user.avatar.url" suppose to be "postedUserAvatarUrl" -->
-						
-						<div class="spacer"></div>
-						<br></br>
-						<md-divider class = "feedContent">
-							<h4>{{ item.who }}</h4>
-							<h5>{{ item.what }}</h5>
-							<h5><b>{{ item.notes }}</b></h5>
-							<h6>{{ item.when }}</h6>
-						</md-divider>	
-					</div>
-				</md-list-item>
+			<div class = "feed">
+				<md-grid-list
+			        md-cols-sm="1" md-cols-md="2" md-cols-gt-md="6"
+			        md-row-height-gt-md="1:1" md-row-height="2:2"
+			        md-gutter="12px" md-gutter-gt-sm="8px" >
+				    <md-grid-tile class="aliceblue"
+				        md-rowspan="2" md-colspan="3" md-colspan-sm="1">
+						<md-grid-tile-header>
+					        <h3>Messages</h3>
+						</md-grid-tile-header>
+						<!-- Enter Wanted MESSAGES Text Here -->
+				    </md-grid-tile>
+			    	<md-grid-tile class="gray"
+						md-rowspan="2" md-colspan="3" md-colspan-sm="1">
+						<md-grid-tile-header>
+				        	<h3>Tasks</h3>
+						</md-grid-tile-header>
+						<!-- Enter Wanted TASKS Text Here -->
+					</md-grid-tile>
+				</md-grid-list>
 			</div>
 		</md-card>
 	</md-content>
-	<div class="port_spacer"></div>
-	<div>
-		<md-content>
-			<md-card style="margin:0">
-				<!-- <md-list> -->
-				<md-subheader class="md-no-sticky" style = "background-color:aliceblue; margin-right:0;">Tasks</md-subheader>
-				<md-list-item class="md-3-line" ng-repeat="item in tasks">
-				<!-- <img ng-src="{{item.face}}?{{$index}}" class="md-avatar" alt="{{item.who}}" /> -->
-					<div class="md-list-item-text" style="border: 1px solid black;">
-						<md-divider class = "feedContent">
-							<h6><u><em>Ex: {{ item.ExNum }}</em></u></h6>
-							<h5>Task Title: {{ item.notes }}</h5>
-							<h6>Due Date: {{ item.dueDate }}</h6>
-						</md-divider>	
-					</div>
-				</md-list-item>
-			</md-card>
-		</md-content>	
-</div>
-		<!-- </md-card> -->
 </div>
\ No newline at end of file