-
-
- {{::message.text}}
-
+
+
+
+
-
-
- {{::message.time}}
-
-
- {{::message.ago}}
-
+
+ {{::message.text}}
-
\ No newline at end of file
+
+
+ {{::message.time}}
+
+
+ {{::message.ago}}
+
+
+
diff --git a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js
index cfc5055..0ebdde8 100644
--- a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js
+++ b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.js
@@ -35,7 +35,7 @@ blurAdminApp.directive('blurFeed', function () {
ago: 'a day ago',
}, {
type: 'geo-message',
- author: 'Kolya',
+ author: 'Nick',
header: 'posted location',
text: 'New York, NY, USA',
time: 'Yesterday 11:37 am',
diff --git a/src/app/pages/dashboard/widgets/pieCharts/_pieCharts.scss b/src/app/pages/dashboard/widgets/pieCharts/_pieCharts.scss
index 50d7bfe..4eedcf7 100644
--- a/src/app/pages/dashboard/widgets/pieCharts/_pieCharts.scss
+++ b/src/app/pages/dashboard/widgets/pieCharts/_pieCharts.scss
@@ -6,6 +6,10 @@
padding: 0 15px;
float: left;
box-sizing: border-box;
+
+ .panel {
+ height: $small-panel-height;
+ }
}
@media screen and (min-width: 1325px) {
.pie-chart-item-container {
diff --git a/src/app/pages/dashboard/widgets/popularApp/_popularApp.scss b/src/app/pages/dashboard/widgets/popularApp/_popularApp.scss
index 9af271a..a621109 100644
--- a/src/app/pages/dashboard/widgets/popularApp/_popularApp.scss
+++ b/src/app/pages/dashboard/widgets/popularApp/_popularApp.scss
@@ -1,3 +1,39 @@
.popular-app {
- height: 444px;
+ .panel-body {
+ padding: 0;
+ }
+
+ .popular-app-img {
+ position: relative;
+ background: #e9e9e9;
+ padding: 30px 0;
+ height: 260px;
+
+ img {
+ width: 70%;
+ position: absolute;
+ transform: translateY(-50%) translate(-50%);
+ top: 50%;
+ left: 50%;
+ }
+ }
+ .popular-app-cost {
+ font-size: 20px;
+ padding: 20px 22px;
+ border-bottom: 1px solid $border;
+ }
+ .popular-app-info {
+ padding: 20px 22px;
+ font-size: 20px;
+ text-align: center;
+ .info-label {
+ font-size: 12px;
+ }
+ }
+ .row {
+ margin: 0;
+ > div {
+ padding: 0;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/app/pages/dashboard/widgets/popularApp/popularApp.html b/src/app/pages/dashboard/widgets/popularApp/popularApp.html
index ad277b7..d5699ee 100644
--- a/src/app/pages/dashboard/widgets/popularApp/popularApp.html
+++ b/src/app/pages/dashboard/widgets/popularApp/popularApp.html
@@ -1,25 +1,25 @@
-
-
-
+
+
+
+
+
+ Most Popular App
-
-
-
Most Popular App
-
17$
-
-
-
-
Total Visits
-
47,512
-
-
-
-
+
+ 175$
-
\ No newline at end of file
+
+
+
+
Total Visits
+
47,512
+
+
+
+
diff --git a/src/app/pages/dashboard/widgets/todo/_todo.scss b/src/app/pages/dashboard/widgets/todo/_todo.scss
index f802483..857dc72 100644
--- a/src/app/pages/dashboard/widgets/todo/_todo.scss
+++ b/src/app/pages/dashboard/widgets/todo/_todo.scss
@@ -6,8 +6,6 @@ input.task-todo {
ul.todo-list {
margin: 0;
padding: 0;
- height: 435px;
- overflow: auto;
.placeholder, .ui-sortable-placeholder {
background: #fff;
}
diff --git a/src/app/pages/dashboard/widgets/todo/todo.js b/src/app/pages/dashboard/widgets/todo/todo.js
index eabf0db..3752828 100644
--- a/src/app/pages/dashboard/widgets/todo/todo.js
+++ b/src/app/pages/dashboard/widgets/todo/todo.js
@@ -59,11 +59,6 @@ blurAdminApp.directive('blurTodo', function () {
edit: false,
markId: 4
},
- {
- text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro. Eirmod prompta usu ex, meliore oporteat est ad.',
- edit: false,
- markId: 3
- }
];
$scope.getMarkColor = function (id) {
diff --git a/src/assets/css/_variables.scss b/src/assets/css/_variables.scss
index 54e00b5..7b37584 100644
--- a/src/assets/css/_variables.scss
+++ b/src/assets/css/_variables.scss
@@ -51,4 +51,8 @@ $resXS: 500px;
$resXXS: 430px;
$resMin: 320px;
-$top-height: 66px;
\ No newline at end of file
+$top-height: 66px;
+
+$small-panel-height: 120px;
+$medium-panel-height: 400px;
+$large-panel-height: 824px;
\ No newline at end of file
diff --git a/src/assets/css/main.scss b/src/assets/css/main.scss
index 281fd97..10a7eaa 100644
--- a/src/assets/css/main.scss
+++ b/src/assets/css/main.scss
@@ -19,6 +19,7 @@
"../../app/components/backTop/backTop.scss",
"../../app/components/msgCenter/msgCenter.scss",
"../../app/components/blurPanel/blurPanel.scss",
+"../../app/pages/dashboard/dashboard.scss",
"../../app/pages/dashboard/widgets/calendar/calendar.scss",
"../../app/pages/dashboard/widgets/pieCharts/pieCharts.scss",
"../../app/pages/dashboard/widgets/amChart/amChart.scss",
diff --git a/src/assets/img/chernika.png b/src/assets/img/chernika.png
new file mode 100644
index 0000000..e852950
Binary files /dev/null and b/src/assets/img/chernika.png differ
diff --git a/src/assets/pictures/Kolya.png b/src/assets/pictures/Nick.png
similarity index 100%
rename from src/assets/pictures/Kolya.png
rename to src/assets/pictures/Nick.png