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/components/contentTop/contentTop.html b/src/app/components/contentTop/contentTop.html index 1aec116..10304c7 100644 --- a/src/app/components/contentTop/contentTop.html +++ b/src/app/components/contentTop/contentTop.html @@ -6,8 +6,4 @@ Home
  • {{ activePageTitle }}
    • -
    - -
    -
    \ No newline at end of file diff --git a/src/app/components/pageTop/_pageTop.scss b/src/app/components/pageTop/_pageTop.scss index 6fb4cf8..0c1c0e7 100644 --- a/src/app/components/pageTop/_pageTop.scss +++ b/src/app/components/pageTop/_pageTop.scss @@ -30,7 +30,7 @@ a.al-logo { .user-profile { float: right; - min-width: 190px; + min-width: 230px; margin-top: 10px; } @@ -85,6 +85,26 @@ a.collapse-menu-link { } } +.al-skin-dropdown { + float: right; + margin-top: 14px; + margin-right: 26px; + + .tpl-skin-panel { + max-height: 300px; + overflow-y: scroll; + overflow-x: hidden; + } +} + +.icon-palette { + display: inline-block; + width: 14px; + height: 13px; + background: url(../img/palette.png); + background-size: cover; +} + .search { text-shadow: none; color: #fff; @@ -141,4 +161,8 @@ a.collapse-menu-link { a.collapse-menu-link { margin-left: 10px; } + + .al-skin-dropdown { + display: none; + } } diff --git a/src/app/components/pageTop/pageTop.html b/src/app/components/pageTop/pageTop.html index 7cdfca8..9dd37b2 100644 --- a/src/app/components/pageTop/pageTop.html +++ b/src/app/components/pageTop/pageTop.html @@ -21,5 +21,10 @@ + +
    + +
    +
    \ 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/amChart/amChart.js b/src/app/pages/dashboard/widgets/amChart/amChart.js index 5bc5172..c41c735 100644 --- a/src/app/pages/dashboard/widgets/amChart/amChart.js +++ b/src/app/pages/dashboard/widgets/amChart/amChart.js @@ -16,7 +16,7 @@ blurAdminApp.directive('amChart', function () { { date: new Date(2013, 5), value: 31000}, { date: new Date(2013, 6), value: 40000}, { date: new Date(2013, 7), value: 37000}, - { date: new Date(2013, 8), value: 20000}, + { date: new Date(2013, 8), value: 18000}, { date: new Date(2013, 9), value: 5000}, { date: new Date(2013, 10), value: 40000}, { date: new Date(2013, 11), value: 20000}, @@ -51,8 +51,8 @@ blurAdminApp.directive('amChart', function () { graphs: [ { id: 'g1', - bullet: 'round', - bulletSize: 8, + bullet: 'none', + //bulletSize: 8, useLineColorForBulletBorder: true, lineColor: colorPrimary, lineThickness: 1, diff --git a/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss b/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss index 08bf33b..781659f 100644 --- a/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss +++ b/src/app/pages/dashboard/widgets/blurFeed/_blurFeed.scss @@ -11,11 +11,62 @@ padding-top: 0; } - img { - float: left; - border-radius: 30px; + .message-icon { width: 60px; height: 60px; + float: left; + position: relative; + + > img, .media-icon { + border-radius: 30px; + width: 100%; + height: 100%; + } + + .media-icon { + display: inline-block; + padding: 4px; + &:after { + content: ''; + display: inline-block; + width: 52px; + height: 52px; + background-size: contain; + } + &.video-message { + background: $video-message-color; + &:after { + background-image: url(../img/feed-video.svg); + } + } + &.image-message { + background: $image-message-color; + padding: 15px; + &:after { + width: 30px; + height: 30px; + background-image: url(../img/feed-image.svg); + } + } + &.geo-message { + background: $geo-message-color; + padding: 15px; + &:after { + width: 30px; + height: 30px; + background-image: url(../img/feed-location.svg); + } + } + } + + .sub-photo-icon { + position: absolute; + width: 25px; + height: 25px; + right: -2px; + bottom: -2px; + border: 2px solid #fff; + } } .text-block { @@ -130,7 +181,7 @@ } &.right { - img { + .message-icon { float: right; } .text-block { diff --git a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html index f220fc2..40c1dc6 100644 --- a/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html +++ b/src/app/pages/dashboard/widgets/blurFeed/blurFeed.html @@ -1,7 +1,13 @@
    - +
    + +
    +
    + + +
    {{ ::message.author }}{{ ::message.header }} 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/app/pages/dashboard/widgets/trafficChart/trafficChart.js b/src/app/pages/dashboard/widgets/trafficChart/trafficChart.js index 5aa3f0c..1c4b6d0 100644 --- a/src/app/pages/dashboard/widgets/trafficChart/trafficChart.js +++ b/src/app/pages/dashboard/widgets/trafficChart/trafficChart.js @@ -40,6 +40,7 @@ blurAdminApp.directive('trafficChart', function () { var ctx = document.getElementById('chart-area').getContext('2d'); window.myDoughnut = new Chart(ctx).Doughnut(doughnutData, { + segmentShowStroke: false, responsive: true, legendTemplate: '
      ' + '<% for (var i=0; i' + 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 diff --git a/src/assets/css/skins/_02_transparent.scss b/src/assets/css/skins/_02_transparent.scss index 6799831..36b304c 100644 --- a/src/assets/css/skins/_02_transparent.scss +++ b/src/assets/css/skins/_02_transparent.scss @@ -1,6 +1,4 @@ body.badmin-transparent { - .panel, .panel:hover { - border-color: rgba(80, 80, 80, 0.5); - background-color: rgba(0, 0, 0, 0.5); - } + @include overrideColors(#fff); + @include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9)); } \ No newline at end of file diff --git a/src/assets/css/skins/_04_peachy.scss b/src/assets/css/skins/_04_peachy.scss index e69de29..ec9b112 100644 --- a/src/assets/css/skins/_04_peachy.scss +++ b/src/assets/css/skins/_04_peachy.scss @@ -0,0 +1,6 @@ +body.badmin-peachy { + background-image: url(../img/peachy-bg.jpg); + .page-top { + background-color: rgba(0,0,0,.5); + } +} \ No newline at end of file diff --git a/src/assets/css/skins/_05_material.scss b/src/assets/css/skins/_05_material.scss index e69de29..6169644 100644 --- a/src/assets/css/skins/_05_material.scss +++ b/src/assets/css/skins/_05_material.scss @@ -0,0 +1,3 @@ +body.badmin-material { + background: #039be6; +} \ No newline at end of file diff --git a/src/assets/css/skins/_06_transblue.scss b/src/assets/css/skins/_06_transblue.scss index 1e96468..52e4092 100644 --- a/src/assets/css/skins/_06_transblue.scss +++ b/src/assets/css/skins/_06_transblue.scss @@ -5,8 +5,6 @@ body.badmin-transblue { background-color: rgba(0,0,0,.5); } - .panel, .panel:hover { - border-color: rgba(80, 80, 80, 0.5); - background-color: rgba(0, 0, 0, 0.5); - } + @include overrideColors(#fff); + @include overridePanelBg(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.9)); } \ No newline at end of file diff --git a/src/assets/css/skins/skins.scss b/src/assets/css/skins/skins.scss index 08b25ef..5cca13f 100644 --- a/src/assets/css/skins/skins.scss +++ b/src/assets/css/skins/skins.scss @@ -1,3 +1,32 @@ +@mixin overrideColors($color) { + color: $color; + + p,.pie-charts,.panel-heading>.dropdown .dropdown-toggle, .panel-title, .panel-title>.small, .panel-title>.small>a, .panel-title>a, .panel-title>small, .panel-title>small>a,.traffic-text span { + color: $color; + } + .traffic-text { + color: $warning; + } + .feed-message .message-time, .text-muted { + color: darken($color, 20); + } +} + +@mixin overridePanelBg($color, $borderColor, $dropdownColor) { + .panel, .panel:hover { + border-color: $borderColor; + background-color: $color; + } + + .progress { + background: $color; + } + + .dropdown-menu { + background-color: $dropdownColor; + } +} + @import '02_transparent'; @import '03_blue'; @import '04_peachy'; diff --git a/src/assets/img/feed-image.svg b/src/assets/img/feed-image.svg new file mode 100644 index 0000000..5bb98bc --- /dev/null +++ b/src/assets/img/feed-image.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + diff --git a/src/assets/img/feed-location.svg b/src/assets/img/feed-location.svg new file mode 100644 index 0000000..226f4c1 --- /dev/null +++ b/src/assets/img/feed-location.svg @@ -0,0 +1,13 @@ + + + + + + + + diff --git a/src/assets/img/feed-video.svg b/src/assets/img/feed-video.svg new file mode 100644 index 0000000..0e78d4b --- /dev/null +++ b/src/assets/img/feed-video.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/img/palette.png b/src/assets/img/palette.png new file mode 100644 index 0000000..ffb62a8 Binary files /dev/null and b/src/assets/img/palette.png differ diff --git a/src/assets/img/peachy-bg.jpg b/src/assets/img/peachy-bg.jpg new file mode 100644 index 0000000..ea23b47 Binary files /dev/null and b/src/assets/img/peachy-bg.jpg differ