jinql
/
blur-admin
mirror of https://github.com/akveo/blur-admin
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/v2' into v2 

# Conflicts:
#	src/app/pages/pages.module.js
#	src/app/theme/components/contentTop/contentTop.directive.js
#	src/app/theme/components/sidebar/SidebarCtrl.js
pull/3/head
KostyaDanovsky 2016-01-12 18:33:37 +03:00
parent bf74c51a6f 64f90f8fba
commit 30bc596a3b
22 changed files with 514 additions and 411 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bower.json
View File

@ -47,12 +47,12 @@
"angular-chart.js": "~0.8.8",
"angular-chartist.js": "~3.3.12",
"angular-morris-chart": "~1.1.0",
"angular-ui-tree": "~2.12.0",
"ionrangeslider": "~2.1.2",
"angular-bootstrap": "~0.14.3",
"angular-animate": "~1.4.8",
"textAngular": "~1.4.6",
"angular-xeditable": "~0.1.9"
"angular-xeditable": "~0.1.9",
"ng-js-tree": "~0.0.7"
},
"overrides": {
"amcharts": {

1
src/app/app.js
View File

@ -10,6 +10,7 @@ angular.module('BlurAdmin', [
'smart-table',
"xeditable",
'ui.slimscroll',
'ngJsTree',
'BlurAdmin.theme',
'BlurAdmin.pages',

43
src/app/pages/dashboard/timeline/timeline.html
View File

@ -1,43 +0,0 @@
<!-- todo: remove whole block -->
<section id="cd-timeline" class="cd-container cssanimations" ng-controller="timelineCtrl">
<div class="cd-timeline-block">
<div class="cd-timeline-img cd-picture">
<img src="img/cd-icon-picture.svg" alt="Picture">
</div>
<div class="cd-timeline-content cd-timeline-content-green">
<h5>Title of section 1</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi
placeat iure tempora laudantium ipsa ad debitis unde? Iste voluptatibus minus veritatis qui ut.</p>
<span class="cd-date">Jan 14</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img cd-movie">
<img src="img/cd-icon-movie.svg" alt="Movie">
</div>
<div class="cd-timeline-content cd-timeline-content-red">
<h5>Title of section 2</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi
placeat iure tempora laudantium ipsa ad debitis unde?</p>
<span class="cd-date">Jan 18</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img cd-location">
<img src="img/cd-icon-location.svg" alt="Location">
</div>
<div class="cd-timeline-content cd-timeline-content-blue">
<h5>Title of section 3</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum.</p>
<span class="cd-date">Feb 18</span>
</div>
</div>
</section>

2
src/app/pages/form/inputs/widgets/switch/switch.directive.js
View File

@ -6,7 +6,7 @@
'use strict';
angular.module('BlurAdmin.pages.form')
.service('switch', switchDirective);
.directive('switch', switchDirective);
/** @ngInject */
function switchDirective($timeout) {

4
src/app/pages/form/inputs/widgets/tagsInput/tagsInput.directive.js
View File

@ -6,10 +6,10 @@
'use strict';
angular.module('BlurAdmin.pages.form')
.service('tagsInput', tagsInput);
.directive('tagInput', tagInput);
/** @ngInject */
function tagsInput() {
function tagInput() {
return {
restrict: 'A',
link: function( $scope, elem, attr) {

1
src/app/pages/pages.module.js
View File

@ -28,6 +28,7 @@
'BlurAdmin.pages.tabs',
'BlurAdmin.pages.typography',
'BlurAdmin.pages.ui',
'BlurAdmin.pages.timeline',
])
.config(routeConfig);

2
src/app/pages/tables/basic/tables.html
View File

@ -31,7 +31,7 @@
</div>
</div>
<div class="col-lg-6 col-md-12">
<div ba-panel-title="Responsive Table" ba-panel-class="with-scroll table-panel">
<div ba-panel ba-panel-title="Responsive Table" ba-panel-class="with-scroll table-panel">
<div include-with-scope="app/pages/tables/widgets/responsiveTable.html"></div>
</div>
</div>

44
src/app/pages/tables/tables.html
View File

@ -1,44 +0,0 @@
<div class="widgets">
<div class="row">
<div class="col-md-12"
ba-panel
ba-panel-title="Smart Table"
ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/smartTable.html"></div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div
ba-panel
ba-panel-title="Hover Tows and Fix Headers"
ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/hoverRows.html"></div>
</div>
<div
ba-panel
ba-panel-title="Condensed Table"
ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/condensedTable.html"></div>
</div>
</div>
<div class="col-md-6">
<div
ba-panel
ba-panel-title="Striped Rows"
ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/stripedRows.html"></div>
</div>
<div
ba-panel
ba-panel-title="Bordered Table"
ba-panel-class="with-scroll">
<div include-with-scope="app/pages/tables/widgets/borderedTable.html"></div>
</div>
</div>
</div>
</div>

4
src/app/pages/dashboard/timeline/TimelineCtrl.js → src/app/pages/timeline/TimelineCtrl.js
View File

@ -5,8 +5,8 @@
(function () {
'use strict';
angular.module('BlurAdmin.pages.dashboard')
.service('TimelineCtrl', TimelineCtrl);
angular.module('BlurAdmin.pages.timeline')
.controller('TimelineCtrl', TimelineCtrl);
/** @ngInject */
function TimelineCtrl() {

101
src/app/pages/timeline/timeline.html Normal file
View File

@ -0,0 +1,101 @@
<!-- todo: remove whole block -->
<div ba-panel>
<section id="cd-timeline" class="cd-container cssanimations" ng-controller="TimelineCtrl">
<div class="cd-timeline-block">
<div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg success"><img ng-src="{{::( 'Euro-Coin' | kameleonImg )}}"></div>
</div>
<div class="cd-timeline-content cd-timeline-content-green">
<h5>Title of section 1</h5>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iusto, optio, dolorum provident rerum aut hic quasi
placeat iure tempora laudantium ipsa ad debitis unde? Iste voluptatibus minus veritatis qui ut.</p>
<span class="cd-date">Jan 14</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg danger"><img ng-src="{{::( 'Laptop-Signal' | kameleonImg )}}"></div>
</div>
<div class="cd-timeline-content cd-timeline-content-red">
<h5>Title of section 2</h5>
<p>Donec dapibus at leo eget volutpat. Praesent dolor tellus, ultricies venenatis molestie eu, luctus eget nibh.
Curabitur ullamcorper eleifend nisl.</p>
<span class="cd-date">Jan 18</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg primary"><img ng-src="{{::( 'Checklist' | kameleonImg )}}"></div>
</div>
<div class="cd-timeline-content cd-timeline-content-blue">
<h5>Title of section 3</h5>
<p>Phasellus auctor tellus eget lacinia condimentum. Cum sociis natoque penatibus et magnis dis parturient
montes.</p>
<span class="cd-date">Feb 18</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg success"><img ng-src="{{::( 'Boss-3' | kameleonImg )}}"></div>
</div>
<div class="cd-timeline-content cd-timeline-content-green">
<h5>Title of section 4</h5>
<p>Morbi fringilla in massa ac posuere. Fusce non sagittis massa, id accumsan odio. Nullam eget tempor est.
Etiam eu felis eu purus aliquam tristique id quis nisl. Nam eros nibh, consequat sed pulvinar eu, ultrices
ornare ligula. Aenean interdum sed nunc sed hendrerit.</p>
<span class="cd-date">Feb 20</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg danger"><img ng-src="{{::( 'Online-Shopping' | kameleonImg )}}"></div>
</div>
<div class="cd-timeline-content cd-timeline-content-red">
<h5>Title of section 5</h5>
<p> Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Curabitur eget mattis
metus. Nullam egestas eros metus, quis fringilla urna accumsan sed. Aliquam ultrices at arcu vitae
tincidunt.</p>
<span class="cd-date">Feb 21</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg primary"><img ng-src="{{::( 'Money-Increase' | kameleonImg )}}"></div>
</div>
<div class="cd-timeline-content cd-timeline-content-blue">
<h5>Title of section 6</h5>
<p>Praesent bibendum ante mattis augue consectetur, ut commodo turpis consequat. Donec ligula eros, porta in
iaculis vel, semper ac sem. Integer at mauris lorem.</p>
<span class="cd-date">Feb 23</span>
</div>
</div>
<div class="cd-timeline-block">
<div class="cd-timeline-img">
<div class="kameleon-icon with-round-bg success"><img ng-src="{{::( 'Vector' | kameleonImg )}}"></div>
</div>
<div class="cd-timeline-content cd-timeline-content-green">
<h5>Title of section 7</h5>
<p>Vivamus ut laoreet erat, vitae eleifend eros. Sed varius id tellus non lobortis. Sed dolor ante, cursus non
scelerisque sed, euismod id eros.</p>
<span class="cd-date">Feb 24</span>
</div>
</div>
</section>
</div>

19
src/app/pages/timeline/timeline.module.js Normal file
View File

@ -0,0 +1,19 @@
/**
* @author a.demeshko
* created on 1/12/16
*/
(function () {
'use strict';
angular.module('BlurAdmin.pages.timeline', [])
.config(routeConfig);
/** @ngInject */
function routeConfig($stateProvider) {
$stateProvider
.state('timeline', {
url: '/timeline',
templateUrl: 'app/pages/timeline/timeline.html'
});
}
})();

93
src/app/pages/tree/tree.html
View File

@ -1,72 +1,39 @@
<div>
<script type="text/ng-template" id="nodes_renderer.html">
<div ui-tree-handle class="tree-node tree-node-content" ng-class="{'selected' : this.selected}"
ng-click="select(this)">
<a ng-if="node.nodes && node.nodes.length > 0" data-nodrag ng-click="toggle(this)"><i class="control"
ng-class="{
'ion-chevron-right': collapsed,
'ion-chevron-down': !collapsed
}"></i></a>
<i class="control ion-document" ng-if="!node.nodes || node.nodes.length < 1"></i>
{{node.title}}
</div>
<ol ui-tree-nodes="" ng-model="node.nodes" ng-class="{hidden: collapsed}">
<li ng-repeat="node in node.nodes" ng-show="visible(node)" ui-tree-node ng-include="'nodes_renderer.html'"></li>
</ol>
</script>
<div class="row">
<div class="col-md-6">
<div ba-panel ba-panel-title="Basic Action" ba-panel-class="with-scroll tree-panel">
<div class="row" ng-controller="treeCtrl">
<div class="col-sm-4">
<div class="control-side text-center">
<div>
<button class="btn btn-primary" ng-click="newSubItem()">Add</button>
</div>
<div>
<button class="btn btn-primary" ng-click="remove()">Remove</button>
</div>
<div>
<button class="btn btn-primary" ng-click="collapseAll()">Collapse All</button>
</div>
<div>
<button class="btn btn-primary" ng-click="expandAll()">Expand All</button>
</div>
<div>
<button class="btn btn-primary" ng-click="refresh()">Refresh</button>
</div>
<div>
<div class="form-group text-left search-container">
<label for="search">Filter</label>
<input id="search" type="text" class="form-control" ng-model="query" ng-change="find()">
</div>
</div>
<div class="row" ng-controller="treeCtrl">
<div class="col-md-6">
<div ba-panel ba-panel-title="Basic Action" ba-panel-class="with-scroll tree-panel">
<div class="row">
<div class="col-sm-4">
<div class="control-side text-center">
<div>
<button class="btn btn-primary" ng-click="addNewNode()">Add</button>
</div>
</div>
<div class="col-sm-8">
<div ui-tree data-drag-enabled="false" id="tree-root">
<ol ui-tree-nodes ng-model="basicData">
<li ng-repeat="node in basicData" ng-show="visible(node)" ui-tree-node
ng-include="'nodes_renderer.html'"></li>
</ol>
<div>
<button class="btn btn-primary" ng-click="collapse()">Collapse All</button>
</div>
<div>
<button class="btn btn-primary" ng-click="expand()">Expand All</button>
</div>
<div>
<button class="btn btn-primary" ng-click="refresh()">Refresh</button>
</div>
<div>
<div class="form-group text-left search-container">
<label for="search">Filter</label>
<input id="search" type="text" class="form-control" ng-model="query" ng-change="find()">
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div ba-panel ba-panel-title="Drag & Drop" ba-panel-class="with-scroll tree-panel">
<div data-ui-tree="treeOptions" data-drag-enabled="true" id="tree-root-drag" ng-controller="treeCtrl">
<ol data-ui-tree-nodes ng-model="dragData">
<li data-ng-repeat="node in dragData" data-ui-tree-node ng-include="'nodes_renderer.html'"></li>
</ol>
<div class="col-sm-8">
<div js-tree="basicConfig" ng-model="treeData" should-apply="applyModelChanges()" tree="basicTree" tree-events="ready:readyCB"></div>
</div>
</div>
</div>
</div>
<div class="col-md-6">
<div ba-panel ba-panel-title="Drag & Drop" ba-panel-class="with-scroll tree-panel">
<div js-tree="dragConfig" ng-model="dragData"></div>
</div>
</div>
</div>
</div>
</div>

562
src/app/pages/tree/treeCtrl.js
View File

@ -11,239 +11,377 @@
/** @ngInject */
function treeCtrl($scope, $timeout) {
var getRootNodesScope = function () {
return angular.element(document.getElementById('tree-root')).scope();
$scope.ignoreChanges = false;
var newId = 0;
$scope.ignoreChanges = false;
$scope.newNode = {};
$scope.basicConfig = {
core: {
multiple: false,
check_callback: true,
worker: true
},
'types': {
'folder': {
'icon': 'ion-ios-folder'
},
'default': {
'icon': 'ion-document-text'
}
},
'plugins': ['types'],
'version': 1
};
var getFirstNode = function () {
return angular.element(document.getElementsByClassName("tree-node")[0]).scope();
$scope.dragConfig = {
'core': {
'check_callback': true,
'themes': {
'responsive': false
}
},
'types': {
'folder': {
'icon': 'ion-ios-folder'
},
'default': {
'icon': 'ion-document-text'
}
},
"plugins": ["dnd", 'types']
};
$scope.select = function (item) {
$scope.current.selected = false;
$scope.current = item;
$scope.current.selected = true;
$scope.addNewNode = function () {
$scope.ignoreChanges = true;
var selected = this.basicTree.jstree(true).get_selected()[0];
if (selected)
$scope.treeData.push({
id: (newId++).toString(),
parent: selected,
text: "New node " + newId,
state: {opened: true}
});
$scope.basicConfig.version++;
};
$scope.remove = function () {
$scope.current.remove();
$scope.current = getFirstNode();
$scope.current.selected = true;
$scope.refresh = function () {
$scope.ignoreChanges = true;
newId = 0;
$scope.treeData = getDefaultData();
$scope.basicConfig.version++;
};
$scope.toggle = function (scope) {
scope.toggle();
$scope.expand = function () {
$scope.ignoreChanges = true;
$scope.treeData.forEach(function (n) {
n.state.opened = true;
});
$scope.basicConfig.version++;
};
$scope.newSubItem = function () {
var nodeData = $scope.current.$modelValue;
nodeData.nodes.push({
id: nodeData.id * 10 + nodeData.nodes.length,
title: nodeData.title + '.' + (nodeData.nodes.length + 1),
nodes: []
$scope.collapse = function () {
$scope.ignoreChanges = true;
$scope.treeData.forEach(function (n) {
n.state.opened = false;
});
$scope.basicConfig.version++;
};
$scope.readyCB = function() {
$timeout(function() {
$scope.ignoreChanges = false;
});
};
$scope.collapseAll = function () {
var scope = getRootNodesScope();
scope.collapseAll();
$scope.applyModelChanges = function() {
return !$scope.ignoreChanges;
};
$scope.expandAll = function () {
var scope = getRootNodesScope();
scope.expandAll();
};
$scope.visible = function (item) {
return !($scope.query && $scope.query.length > 0
&& item.title.indexOf($scope.query) == -1);
};
$scope.basicData = getDefaultData();
$scope.refresh = function () {
$scope.basicData = getDefaultData();
$scope.current = getFirstNode();
if ($scope.current) $scope.current.selected = true;
else $scope.current = {};
};
$scope.treeOptions = {
beforeDrop: function (e) {
var sourceValue = e.source.nodeScope.$modelValue.value,
destValue = e.dest.nodesScope.node ? e.dest.nodesScope.node.value : undefined;
return true;
$scope.treeData = getDefaultData();
$scope.dragData = [
{
"id": "nd1",
"parent": "#",
"type": "folder",
"text": "Node 1",
"state": {
"opened": true
}
},
{
"id": "nd2",
"parent": "#",
"type": "folder",
"text": "Node 2",
"state": {
"opened": true
}
},
{
"id": "nd3",
"parent": "#",
"type": "folder",
"text": "Node 3",
"state": {
"opened": true
}
},
{
"id": "nd4",
"parent": "#",
"type": "folder",
"text": "Node 4",
"state": {
"opened": true
}
},
{
"id": "nd5",
"parent": "nd1",
"text": "Node 1.1",
"state": {
"opened": true
}
},
{
"id": "nd6",
"parent": "nd1",
"text": "Node 1.2",
"state": {
"opened": true
}
},
{
"id": "nd7",
"parent": "nd1",
"text": "Node 1.3",
"state": {
"opened": true
}
},
{
"id": "nd8",
"parent": "nd2",
"text": "Node 2.1",
"state": {
"opened": true
}
},
{
"id": "nd9",
"parent": "nd2",
"text": "Node 2.2",
"state": {
"opened": true
}
},
{
"id": "nd10",
"parent": "nd2",
"text": "Node 2.3",
"state": {
"opened": true
}
},
{
"id": "nd11",
"parent": "nd3",
"text": "Node 3.1",
"state": {
"opened": true
}
},
{
"id": "nd12",
"parent": "nd3",
"text": "Node 3.2",
"state": {
"opened": true
}
},
{
"id": "nd13",
"parent": "nd3",
"text": "Node 3.3",
"state": {
"opened": true
}
},
{
"id": "nd14",
"parent": "nd4",
"text": "Node 4.1",
"state": {
"opened": true
}
},
{
"id": "nd15",
"parent": "nd4",
"text": "Node 4.2",
"state": {
"opened": true
}
},
{
"id": "nd16",
"parent": "nd4",
"text": "Node 4.3",
"state": {
"opened": true
}
}
};
];
function getDefaultData() {
return [
{
'id': 1,
'title': 'Node 1',
'nodes': [
{
'id': 11,
'title': 'Node 1.1',
'nodes': [
{
'id': 111,
'title': 'Node 1.1.1',
'nodes': []
}
]
},
{
'id': 12,
'title': 'Node 1.2',
'nodes': []
}
]
}, {
'id': 2,
'title': 'Node 2',
'nodes': [
{
'id': 21,
'title': 'Node 2.1',
'nodes': []
},
{
'id': 22,
'title': 'Node 2.2',
'nodes': []
}
]
}, {
'id': 3,
'title': 'Node 3',
'nodes': [
{
'id': 31,
'title': 'Node 3.1',
'nodes': []
},
{
'id': 32,
'title': 'Node 3.2',
'nodes': [{
'id': 321,
'title': 'Node 3.2.1',
'nodes': []
},
{
'id': 322,
'title': 'Node 3.2.2',
'nodes': []
},
{
'id': 323,
'title': 'Node 3.2.3',
'nodes': []
}]
}
]
},
{
'id': 4,
'title': 'Node 4',
'nodes': [
{
'id': 41,
'title': 'Node 4.1',
'nodes': []
}]
}]
{
"id": "n1",
"parent": "#",
"type": "folder",
"text": "Node 1",
"state": {
"opened": true
}
},
{
"id": "n2",
"parent": "#",
"type": "folder",
"text": "Node 2",
"state": {
"opened": true
}
},
{
"id": "n3",
"parent": "#",
"type": "folder",
"text": "Node 3",
"state": {
"opened": true
}
},
{
"id": "n5",
"parent": "n1",
"text": "Node 1.1",
"state": {
"opened": true
}
},
{
"id": "n6",
"parent": "n1",
"text": "Node 1.2",
"state": {
"opened": true
}
},
{
"id": "n7",
"parent": "n1",
"text": "Node 1.3",
"state": {
"opened": true
}
},
{
"id": "n8",
"parent": "n1",
"text": "Node 1.4",
"state": {
"opened": true
}
},
{
"id": "n9",
"parent": "n2",
"text": "Node 2.1",
"state": {
"opened": true
}
},
{
"id": "n10",
"parent": "n2",
"text": "Node 2.2 (Custom icon)",
"icon": "ion-help-buoy",
"state": {
"opened": true
}
},
{
"id": "n12",
"parent": "n3",
"text": "Node 3.1",
"state": {
"opened": true
}
},
{
"id": "n13",
"parent": "n3",
"type": "folder",
"text": "Node 3.2",
"state": {
"opened": true
}
},
{
"id": "n14",
"parent": "n13",
"text": "Node 3.2.1",
"state": {
"opened": true
}
},
{
"id": "n15",
"parent": "n13",
"text": "Node 3.2.2",
"state": {
"opened": true
}
},
{
"id": "n16",
"parent": "n3",
"text": "Node 3.3",
"state": {
"opened": true
}
},
{
"id": "n17",
"parent": "n3",
"text": "Node 3.4",
"state": {
"opened": true
}
},
{
"id": "n18",
"parent": "n3",
"text": "Node 3.5",
"state": {
"opened": true
}
},
{
"id": "n19",
"parent": "n3",
"text": "Node 3.6",
"state": {
"opened": true
}
}
]
}
$scope.dragData = [
{
"id": 1,
"title": "Node 1",
"nodes": [
{
"id": 11,
"title": "Node 1.1",
"nodes": []
},
{
"id": 12,
"title": "Node 1.2",
"nodes": []
},
{
"id": 12,
"title": "Node 1.3",
"nodes": []
},
{
"id": 13,
"title": "Node 1.4",
"nodes": []
}
]
},
{
"id": 2,
"title": "Node 2",
"nodes": [
{
"id": 21,
"title": "Node 2.1",
"nodes": []
},
{
"id": 22,
"title": "Node 2.2",
"nodes": []
},
{
"id": 22,
"title": "Node 2.3",
"nodes": []
},
{
"id": 23,
"title": "Node 2.4",
"nodes": []
}
]
},
{
"id": 3,
"title": "Node 3",
"nodes": [
{
"id": 31,
"title": "Node 3.1",
"nodes": []
},
{
"id": 31,
"title": "Node 3.2",
"nodes": []
},
{
"id": 32,
"title": "Node 3.3",
"nodes": []
},
{
"id": 33,
"title": "Node 3.4",
"nodes": []
}
]
}
];
$scope.find = function(){};
$timeout(function () {
$scope.current = getFirstNode();
if ($scope.current) $scope.current.selected = true;
else $scope.current = {};
}, 1000);
}
})();

1
src/app/theme/theme.module.js
View File

@ -10,7 +10,6 @@
'chart.js',
'angular-chartist',
'angular.morris-chart',
'ui.tree',
'textAngular',
'BlurAdmin.theme.components'
]);

4
src/assets/img/theme/timeline/cd-icon-location.svg
View File

@ -1,4 +0,0 @@
<svg class="nc-icon glyph" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24">
<path fill="#ffffff" d="M12,0C7.6,0,3,3.4,3,9c0,5.3,8,13.4,8.3,13.7c0.2,0.2,0.4,0.3,0.7,0.3s0.5-0.1,0.7-0.3C13,22.4,21,14.3,21,9
C21,3.4,16.4,0,12,0z M12,12c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3S13.7,12,12,12z"></path>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 394 B

4
src/assets/img/theme/timeline/cd-icon-movie.svg
View File

@ -1,4 +0,0 @@
<svg class="nc-icon glyph" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24"><g>
<path fill="#ffffff" d="M23.6,6.2c-0.3-0.2-0.6-0.2-0.9-0.1L17,8.5V5c0-0.6-0.4-1-1-1H1C0.4,4,0,4.4,0,5v14c0,0.6,0.4,1,1,1h15
c0.6,0,1-0.4,1-1v-3.5l5.6,2.4C22.7,18,22.9,18,23,18c0.2,0,0.4-0.1,0.6-0.2c0.3-0.2,0.4-0.5,0.4-0.8V7C24,6.7,23.8,6.4,23.6,6.2z"></path>
</g></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 442 B

5
src/assets/img/theme/timeline/cd-icon-picture.svg
View File

@ -1,5 +0,0 @@
<svg class="nc-icon glyph" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px" viewBox="0 0 24 24"><g>
<path fill="#ffffff" d="M23,0H1C0.4,0,0,0.4,0,1v22c0,0.6,0.4,1,1,1h22c0.6,0,1-0.4,1-1V1C24,0.4,23.6,0,23,0z M10,5
c1.1,0,2,0.9,2,2c0,1.1-0.9,2-2,2S8,8.1,8,7C8,5.9,8.9,5,10,5z M18.2,19H5.9c-0.8,0-1.3-0.9-0.8-1.6L7.3,14c0.4-0.5,1.1-0.6,1.5-0.2
L11,16l3.1-3.9c0.4-0.5,1.3-0.5,1.6,0.1l3.3,5.3C19.5,18.1,19,19,18.2,19z"></path>
</g></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 507 B

2
src/sass/app/_email.scss
View File

@ -223,7 +223,7 @@
margin-left: 6px;
}
.tag {
.mail-panel .tag {
text-transform: lowercase;
font-size: 11px;
font-weight: 100;

3
src/sass/app/_table.scss Normal file
View File

@ -0,0 +1,3 @@
.table-panel {
height: 295px;
}

3
src/sass/theme/_table.scss
View File

@ -54,9 +54,6 @@
}
}
.table-panel {
height: 280px;
}
.editable-tr-wrap {
.editable-wrap {

0
src/sass/theme/_tree.scss Normal file
View File

23
src/sass/theme/dashboard/_timeline.scss
View File

@ -38,29 +38,6 @@
width: 40px;
height: 40px;
border-radius: 50%;
img {
display: block;
width: 24px;
height: 24px;
position: relative;
left: 50%;
top: 50%;
margin-left: -12px;
margin-top: -12px;
}
&.cd-picture {
background: $success;
}
&.cd-movie {
background: $danger;
}
&.cd-location {
background: $primary;
}
}
@media only screen and (min-width: $resXL) {