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 @@
{{ title }}
\ 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 @@
-
-
+
+
-
-
+
+
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