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

refactor(charts): remove chartJs borders and change morris colors

pull/3/head
alex 2016-02-18 15:06:34 +03:00
parent 2e487f37e2
commit a3534007db
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/pages/charts/chartJs/chartJs.html
View File

@ -2,7 +2,7 @@
<div class="col-md-4" ng-controller="chartJs1DCtrl">
<div ba-panel ba-panel-title="Pie" ba-panel-class="with-scroll ">
<canvas id="pie" class="chart chart-pie"
chart-legend="true" chart-data="data" chart-labels="labels" chart-click="changeData">
chart-legend="true" chart-options="options" chart-data="data" chart-labels="labels" chart-click="changeData">
</canvas>
</div>
</div>
@ -16,7 +16,7 @@
<div class="col-md-4" ng-controller="chartJs1DCtrl">
<div ba-panel ba-panel-title="Polar" ba-panel-class="with-scroll ">
<canvas id="polar-area" class="chart chart-polar-area"
chart-data="data" chart-labels="labels" chart-legend="true" chart-click="changeData">
chart-data="data" chart-options="options" chart-labels="labels" chart-legend="true" chart-click="changeData">
</canvas>
</div>
</div>

1
src/app/pages/charts/chartJs/chartJs1DCtrl.js
View File

@ -14,6 +14,7 @@
$scope.labels =["Sleeping", "Designing", "Coding", "Cycling", "Running"];
$scope.data = [20, 40, 5, 35, 10];
$scope.options = {
segmentStrokeColor : "rgba(0,0,0,0)"
};
$scope.changeData = function () {
$scope.data = shuffle($scope.data);

2
src/app/pages/charts/morris/morrisCtrl.js
View File

@ -10,7 +10,7 @@
/** @ngInject */
function morrisCtrl($scope, $window, layoutColors) {
$scope.colors = [layoutColors.primaryCharts, layoutColors.warningCharts, layoutColors.infoCharts, layoutColors.dangerCharts, layoutColors.successCharts, layoutColors.default, layoutColors.primaryDark];
$scope.colors = [layoutColors.primary, layoutColors.warning, layoutColors.danger, layoutColors.info, layoutColors.success, layoutColors.default, layoutColors.primaryDark];
$scope.lineData = [
{y: "2006", a: 100, b: 90},
{y: "2007", a: 75, b: 65},