mirror of https://github.com/akveo/blur-admin
Merge remote-tracking branch 'origin/v2' into v2
KostyaDanovsky
commit
0393f2599c
|
|
@ -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%;
|
||||
}
|
||||
}
|
||||
|
|
@ -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>
|
||||
|
|
@ -6,8 +6,4 @@
|
|||
<a href="#/dashboard">Home</a></li>
|
||||
<li>{{ activePageTitle }}</li>
|
||||
</ul>
|
||||
<div class="dropdown al-look">
|
||||
<a href class="dropdown-toggle ion-settings" data-toggle="dropdown"></a>
|
||||
<div class="dropdown-menu dropdown-menu-right" tpl-skin-panel></div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,5 +21,10 @@
|
|||
</div>
|
||||
<msg-center></msg-center>
|
||||
<a href class="refresh-data"><i class="fa fa-refresh"></i></a>
|
||||
|
||||
<div class="dropdown al-skin-dropdown">
|
||||
<a href class="dropdown-toggle icon-palette" data-toggle="dropdown"></a>
|
||||
<div class="dropdown-menu dropdown-menu-right" tpl-skin-panel></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
@media screen and (min-width: 1200px) {
|
||||
.row.shift-up {
|
||||
> div {
|
||||
margin-top: -423px;
|
||||
margin-top: -573px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,13 @@
|
|||
|
||||
<div class="feed-messages-container" track-width="smallContainerWidth" min-width="360">
|
||||
<div class="feed-message" ng-repeat="message in feed" ng-class="{'left': $index%2==0, 'right': $index%2==1}">
|
||||
<img ng-src="img/{{ ::message.author }}.png">
|
||||
<div class="message-icon" ng-if="message.type == 'text-message'">
|
||||
<img class="photo-icon" ng-src="img/{{ ::message.author }}.png">
|
||||
</div>
|
||||
<div class="message-icon" ng-if="message.type != 'text-message'">
|
||||
<span class="media-icon" ng-class="::message.type"></span>
|
||||
<img class="sub-photo-icon" ng-src="img/{{ ::message.author }}.png">
|
||||
</div>
|
||||
<div class="text-block" ng-class="{'small-message': smallContainerWidth && message.type != 'text-message', '{{::message.type}}': true}">
|
||||
<div class="message-header">
|
||||
<span class="author">{{ ::message.author }}</span>{{ ::message.header }}
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
input.task-todo {
|
||||
margin-bottom: 14px;
|
||||
margin-top: -2px;
|
||||
}
|
||||
|
||||
ul.todo-list {
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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: '<ul class="<%=name.toLowerCase()%>-legend clearfix">' +
|
||||
'<% for (var i=0; i<segments.length; i++){%>' +
|
||||
|
|
|
|||
|
|
@ -55,4 +55,5 @@ $top-height: 66px;
|
|||
|
||||
$small-panel-height: 114px;
|
||||
$medium-panel-height: 400px;
|
||||
$large-panel-height: 824px;
|
||||
$extra-medium-panel-height: 550px;
|
||||
$large-panel-height: 974px;
|
||||
|
|
@ -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));
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
body.badmin-peachy {
|
||||
background-image: url(../img/peachy-bg.jpg);
|
||||
.page-top {
|
||||
background-color: rgba(0,0,0,.5);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
body.badmin-material {
|
||||
background: #039be6;
|
||||
}
|
||||
|
|
@ -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));
|
||||
}
|
||||
|
|
@ -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';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="548.176px" height="548.176px" viewBox="0 0 548.176 548.176" style="enable-background:new 0 0 548.176 548.176;"
|
||||
xml:space="preserve">
|
||||
<g>
|
||||
<g>
|
||||
<path fill="#FFFFFF" d="M534.75,68.238c-8.945-8.945-19.694-13.417-32.261-13.417H45.681c-12.562,0-23.313,4.471-32.264,13.417
|
||||
C4.471,77.185,0,87.936,0,100.499v347.173c0,12.566,4.471,23.318,13.417,32.264c8.951,8.946,19.702,13.419,32.264,13.419h456.815
|
||||
c12.56,0,23.312-4.473,32.258-13.419c8.945-8.945,13.422-19.697,13.422-32.264V100.499
|
||||
C548.176,87.936,543.699,77.185,534.75,68.238z M511.623,447.672c0,2.478-0.899,4.613-2.707,6.427
|
||||
c-1.81,1.8-3.952,2.703-6.427,2.703H45.681c-2.473,0-4.615-0.903-6.423-2.703c-1.807-1.813-2.712-3.949-2.712-6.427V100.495
|
||||
c0-2.474,0.902-4.611,2.712-6.423c1.809-1.803,3.951-2.708,6.423-2.708h456.815c2.471,0,4.613,0.905,6.42,2.708
|
||||
c1.801,1.812,2.707,3.949,2.707,6.423V447.672L511.623,447.672z"/>
|
||||
<path fill="#FFFFFF" d="M127.91,237.541c15.229,0,28.171-5.327,38.831-15.987c10.657-10.66,15.987-23.601,15.987-38.826
|
||||
c0-15.23-5.333-28.171-15.987-38.832c-10.66-10.656-23.603-15.986-38.831-15.986c-15.227,0-28.168,5.33-38.828,15.986
|
||||
c-10.656,10.66-15.986,23.601-15.986,38.832c0,15.225,5.327,28.169,15.986,38.826C99.742,232.211,112.683,237.541,127.91,237.541z
|
||||
"/>
|
||||
<polygon fill="#FFFFFF" points="210.134,319.765 164.452,274.088 73.092,365.447 73.092,420.267 475.085,420.267 475.085,292.36 356.315,173.587
|
||||
"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
|
|
@ -0,0 +1,13 @@
|
|||
<?xml version="1.0" encoding="iso-8859-1"?>
|
||||
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
width="395.71px" height="395.71px" viewBox="0 0 395.71 395.71" style="enable-background:new 0 0 395.71 395.71;"
|
||||
xml:space="preserve">
|
||||
<g>
|
||||
<path fill="#FFFFFF" d="M197.849,0C122.131,0,60.531,61.609,60.531,137.329c0,72.887,124.591,243.177,129.896,250.388l4.951,6.738
|
||||
c0.579,0.792,1.501,1.255,2.471,1.255c0.985,0,1.901-0.463,2.486-1.255l4.948-6.738c5.308-7.211,129.896-177.501,129.896-250.388
|
||||
C335.179,61.609,273.569,0,197.849,0z M197.849,88.138c27.13,0,49.191,22.062,49.191,49.191c0,27.115-22.062,49.191-49.191,49.191
|
||||
c-27.114,0-49.191-22.076-49.191-49.191C148.658,110.2,170.734,88.138,197.849,88.138z"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 989 B |
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="512" height="512" viewBox="0 0 512 512">
|
||||
<path d="M 256.00,0.00C 114.615,0.00,0.00,114.615,0.00,256.00s 114.615,256.00, 256.00,256.00s 256.00-114.615, 256.00-256.00S 397.385,0.00, 256.00,0.00z M 256.00,464.00 c-114.875,0.00-208.00-93.125-208.00-208.00S 141.125,48.00, 256.00,48.00s 208.00,93.125, 208.00,208.00S 370.875,464.00, 256.00,464.00zM 192.00,144.00L 384.00,256.00L 192.00,368.00 z" fill="#FFFFFF"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 647 B |
Binary file not shown.
|
After Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 355 KiB |
Loading…
Reference in New Issue