From a2b763e00db814ea9ca941f08ae2660a87b8f845 Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Thu, 18 Jun 2015 21:13:31 +0300 Subject: [PATCH 1/2] - 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 @@ -
-
- Messages - -
- {{item.who}} - - -
-

- -

{{ item.who }}

-
{{ item.what }}
-
{{ item.notes }}
-
{{ item.when }}
- -
- +
+ + + +

Messages

+ + + + + +

Tasks

+ + + +
-
-
- - - - Tasks - - -
- -
Ex: {{ item.ExNum }}
-
Task Title: {{ item.notes }}
-
Due Date: {{ item.dueDate }}
- -
- - - -
-
\ No newline at end of file From 94cf0447e4bba64b033041eed5161a3e9308d9a8 Mon Sep 17 00:00:00 2001 From: Matan Bar Yosef Date: Thu, 18 Jun 2015 23:21:09 +0300 Subject: [PATCH 2/2] - tasks.html added - tasksController added - app.js updated when '/tasks' - mainController updated '/tasks' --- templates/css/theme.css | 46 +++++++++++++--------- templates/js/app.js | 5 ++- templates/js/controllers/mainController.js | 2 +- templates/views/home.html | 27 ++++++++++++- 4 files changed, 57 insertions(+), 23 deletions(-) diff --git a/templates/css/theme.css b/templates/css/theme.css index ed28d11..815890f 100644 --- a/templates/css/theme.css +++ b/templates/css/theme.css @@ -86,7 +86,7 @@ body.noscroll position:center; width: 80px; height: 80px; - margin: 6px; /*centers the image in the parent element */ + margin: 6px; -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); @@ -144,11 +144,6 @@ body.noscroll margin-bottom: 10px; } -.md-avatar img -{ - /*TODO*/ -} - .feed { overflow-y: scroll; @@ -156,7 +151,7 @@ body.noscroll /*width: 100%;*/ } -.feedMessages +/*.feedMessages { overflow: scroll; height: 300px; @@ -174,7 +169,7 @@ body.noscroll padding-left: 6%; font-size: 15px; display:table; -} +}*/ .md-no-sticky { @@ -262,7 +257,6 @@ body.noscroll -moz-border-radius: 100px; border-radius: 50px; width: 30%; - /*top: -40px;*/ position: relative; z-index: 50; } @@ -355,14 +349,15 @@ body.noscroll box-sizing: content-box; } - /*gridList Effects*/ -md-grid-list { - margin: 8px; } -.gray{ +md-grid-list +{ + margin: 8px; +} +.gray +{ background:#f5f5f5; - } .aliceblue { @@ -383,24 +378,37 @@ md-grid-list { .red { background: #ff8a80; } - md-grid-tile { - transition: all 400ms ease-out 50ms; + +.whiteframedemoBasicUsage md-whiteframe { + background: #fff; + margin: 20px; + padding: 20px; } + +/* md-grid-tile { + transition: all 400ms ease-out 50ms; +}*/ + /*END gridList Effects*/ +.tasksContent +{ + /*float:left;*/ +} -/* md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button { + + md-list-item .md-no-style.md-button, md-list-item.md-no-proxy.md-button { font-size: inherit; height: inherit; text-align: left; text-transform: none; - width: 100%; + width: 300px; white-space: normal; } -md-list-item, md-list-item .md-list-item-inner { +/*md-list-item, md-list-item .md-list-item-inner { display: -webkit-flex; display: -ms-flexbox; display: flex; diff --git a/templates/js/app.js b/templates/js/app.js index 86cbcc1..0a154b5 100644 --- a/templates/js/app.js +++ b/templates/js/app.js @@ -41,8 +41,11 @@ app.config(['$routeProvider', '$locationProvider', .when('/Settings', { templateUrl: 'templates/views/settings.html', controller: 'settingsController' + }) + .when('/tasks', { + templateUrl: 'templates/views/tasks.html', + controller: 'tasksController' }); - } ]); diff --git a/templates/js/controllers/mainController.js b/templates/js/controllers/mainController.js index 1f175ab..f2eb0b4 100644 --- a/templates/js/controllers/mainController.js +++ b/templates/js/controllers/mainController.js @@ -53,7 +53,7 @@ angular.module('SeHub') "title": "Tasks", "icon": "fa fa-clipboard", "style": "", - "route": "/campuses" + "route": "/tasks" }, { "title": "Settings", "icon": "fa fa-cogs", diff --git a/templates/views/home.html b/templates/views/home.html index 65dabb3..b312bf7 100644 --- a/templates/views/home.html +++ b/templates/views/home.html @@ -22,6 +22,7 @@
+
@@ -34,17 +35,39 @@

Messages

 - + In The Future Will Enter Wanted MESSAGES Text Here

Tasks

 - + +
+ For Task 3 Press: Task #3 +
=====================
+ For Task 4 Press: Task #4 +
+
+ + + + + + + + + \ No newline at end of file