From f8944c3fc97c620b6506c7bfc0d5cb377b7c2516 Mon Sep 17 00:00:00 2001
From: Vladimir Lugovsky <lugovsky.v@gmail.com>
Date: Mon, 23 Nov 2015 16:41:54 +0300
Subject: [PATCH] fix(dashboard): some adjustoments to layout

---
 src/app/components/blurPanel/_blurPanel.scss      | 10 +++++++++-
 src/app/components/blurPanel/blurPanel.html       |  2 +-
 src/app/pages/dashboard/_dashboard.scss           |  2 +-
 src/app/pages/dashboard/dashboard.html            |  8 ++++----
 .../pages/dashboard/widgets/calendar/calendar.js  |  3 ++-
 src/app/pages/dashboard/widgets/todo/_todo.scss   |  1 -
 src/app/pages/dashboard/widgets/todo/todo.js      | 15 +++++++++++++++
 src/assets/css/_variables.scss                    |  3 ++-
 8 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/src/app/components/blurPanel/_blurPanel.scss b/src/app/components/blurPanel/_blurPanel.scss
index d2462a3..93e0a82 100644
--- a/src/app/components/blurPanel/_blurPanel.scss
+++ b/src/app/components/blurPanel/_blurPanel.scss
@@ -19,13 +19,18 @@ $panel-title-height: 35px;
   &.medium-panel {
     height: $medium-panel-height;
   }
+  &.xmedium-panel {
+    height: $extra-medium-panel-height;
+  }
   &.large-panel {
     height: $large-panel-height;
   }
   &.with-scroll {
     .panel-body {
-      overflow-y: auto;
       height: calc(100% - #{$panel-title-height});
+      .panel-content {
+        overflow-y: auto;
+      }
     }
   }
 }
@@ -45,4 +50,7 @@ $panel-title-height: 35px;
 
 .panel-body {
   padding: 15px 22px;
+  .panel-content {
+    height: 100%;
+  }
 }
\ No newline at end of file
diff --git a/src/app/components/blurPanel/blurPanel.html b/src/app/components/blurPanel/blurPanel.html
index 6e8c100..aa48188 100644
--- a/src/app/components/blurPanel/blurPanel.html
+++ b/src/app/components/blurPanel/blurPanel.html
@@ -3,6 +3,6 @@
     <h3 class="panel-title">{{ title }}</h3>
   </div>
   <div class="panel-body">
-    <ng-transclude></ng-transclude>
+    <div class="panel-content" ng-transclude></div>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/pages/dashboard/_dashboard.scss b/src/app/pages/dashboard/_dashboard.scss
index e793424..377a106 100644
--- a/src/app/pages/dashboard/_dashboard.scss
+++ b/src/app/pages/dashboard/_dashboard.scss
@@ -2,7 +2,7 @@
 @media screen and (min-width: 1200px) {
   .row.shift-up {
     > div {
-      margin-top: -423px;
+      margin-top: -573px;
     }
   }
 }
diff --git a/src/app/pages/dashboard/dashboard.html b/src/app/pages/dashboard/dashboard.html
index 377a355..1021bba 100644
--- a/src/app/pages/dashboard/dashboard.html
+++ b/src/app/pages/dashboard/dashboard.html
@@ -36,13 +36,13 @@
 </div>
 
 <div class="row shift-up">
-  <div class="col-lg-3 col-sm-6 col-xs-12">
-    <blur-panel title="To Do List" class-container="medium-panel with-scroll">
+  <div class="col-lg-3 col-md-6 col-xs-12">
+    <blur-panel title="To Do List" class-container="xmedium-panel with-scroll">
       <blur-todo></blur-todo>
     </blur-panel>
   </div>
-  <div class="col-lg-5 col-sm-6 col-xs-12">
-    <blur-panel title="Calendar" class-container="medium-panel with-scroll">
+  <div class="col-lg-5 col-md-6 col-xs-12">
+    <blur-panel title="Calendar" class-container="xmedium-panel with-scroll">
       <blur-calendar></blur-calendar>
     </blur-panel>
   </div>
diff --git a/src/app/pages/dashboard/widgets/calendar/calendar.js b/src/app/pages/dashboard/widgets/calendar/calendar.js
index 0fbb492..77cfea5 100644
--- a/src/app/pages/dashboard/widgets/calendar/calendar.js
+++ b/src/app/pages/dashboard/widgets/calendar/calendar.js
@@ -4,7 +4,8 @@ blurAdminApp.directive('blurCalendar', function () {
   return {
     restrict: 'E',
     controller: ['$scope', function ($scope) {
-      $('#calendar').fullCalendar({
+      var $element = $('#calendar').fullCalendar({
+        //height: 335,
         header: {
           left: 'prev,next today',
           center: 'title',
diff --git a/src/app/pages/dashboard/widgets/todo/_todo.scss b/src/app/pages/dashboard/widgets/todo/_todo.scss
index 857dc72..667a0be 100644
--- a/src/app/pages/dashboard/widgets/todo/_todo.scss
+++ b/src/app/pages/dashboard/widgets/todo/_todo.scss
@@ -1,6 +1,5 @@
 input.task-todo {
   margin-bottom: 14px;
-  margin-top: -2px;
 }
 
 ul.todo-list {
diff --git a/src/app/pages/dashboard/widgets/todo/todo.js b/src/app/pages/dashboard/widgets/todo/todo.js
index 3752828..c85ae5b 100644
--- a/src/app/pages/dashboard/widgets/todo/todo.js
+++ b/src/app/pages/dashboard/widgets/todo/todo.js
@@ -59,6 +59,21 @@ blurAdminApp.directive('blurTodo', function () {
           edit: false,
           markId: 4
         },
+        {
+          text: 'Get in touch with akveo team',
+          edit: false,
+          markId: 1
+        },
+        {
+          text: 'Write email to contact@akveo.com',
+          edit: false,
+          markId: 3
+        },
+        {
+          text: 'Have fun with blur admin',
+          edit: false,
+          markId: 2
+        },
       ];
 
       $scope.getMarkColor = function (id) {
diff --git a/src/assets/css/_variables.scss b/src/assets/css/_variables.scss
index f4b013c..c4a4501 100644
--- a/src/assets/css/_variables.scss
+++ b/src/assets/css/_variables.scss
@@ -55,4 +55,5 @@ $top-height: 66px;
 
 $small-panel-height: 114px;
 $medium-panel-height: 400px;
-$large-panel-height: 824px;
\ No newline at end of file
+$extra-medium-panel-height: 550px;
+$large-panel-height: 974px;
\ No newline at end of file