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

refacor(amCharts): remove borders and fix colors

pull/3/head
alex 2016-02-18 15:01:12 +03:00
parent 2362f0a6dd
commit 2e487f37e2
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/pages/charts/amCharts/combinedChart/combinedChartCtrl.js
View File

@ -37,8 +37,8 @@
"id": "g3", "id": "g3",
color: layoutColors.default, color: layoutColors.default,
"valueAxis": "v1", "valueAxis": "v1",
"lineColor": layoutColors.infoCharts, "lineColor": layoutColors.primaryBg,
"fillColors": layoutColors.infoCharts, "fillColors": layoutColors.primaryBg,
"fillAlphas": 1, "fillAlphas": 1,
"type": "column", "type": "column",
"title": "Actual Sales", "title": "Actual Sales",
@ -52,8 +52,8 @@
"id": "g4", "id": "g4",
"valueAxis": "v1", "valueAxis": "v1",
color: layoutColors.default, color: layoutColors.default,
"lineColor": layoutColors.primaryCharts, "lineColor": layoutColors.primaryLight,
"fillColors": layoutColors.primaryCharts, "fillColors": layoutColors.primaryLight,
"fillAlphas": 1, "fillAlphas": 1,
"type": "column", "type": "column",
"title": "Target Sales", "title": "Target Sales",
@ -72,7 +72,7 @@
"bulletSize": 5, "bulletSize": 5,
"hideBulletsCount": 50, "hideBulletsCount": 50,
"lineThickness": 2, "lineThickness": 2,
"lineColor": layoutColors.success, "lineColor": layoutColors.danger,
"type": "smoothedLine", "type": "smoothedLine",
"title": "Market Days", "title": "Market Days",
"useLineColorForBulletBorder": true, "useLineColorForBulletBorder": true,
@ -88,7 +88,7 @@
"bulletSize": 5, "bulletSize": 5,
"hideBulletsCount": 50, "hideBulletsCount": 50,
"lineThickness": 2, "lineThickness": 2,
"lineColor": layoutColors.primary, "lineColor": layoutColors.warning,
"type": "smoothedLine", "type": "smoothedLine",
"dashLength": 5, "dashLength": 5,
"title": "Market Days ALL", "title": "Market Days ALL",

10
src/app/theme/amChartConfig.js
View File

@ -20,17 +20,15 @@
}, },
AmCoordinateChart: { AmCoordinateChart: {
colors: [layoutColors.$primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.successBg] colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg]
}, },
AmStockChart: { AmStockChart: {
colors: [layoutColors.$primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.successBg] colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg]
}, },
AmSlicedChart: { AmSlicedChart: {
colors: [layoutColors.$primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.successBg], colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg],
outlineAlpha: 1,
outlineThickness: 2,
labelTickColor: "#FFFFFF", labelTickColor: "#FFFFFF",
labelTickAlpha: 0.3 labelTickAlpha: 0.3
}, },
@ -59,7 +57,7 @@
}, },
ChartCursor: { ChartCursor: {
cursorColor: layoutColors.dangerCharts, cursorColor: layoutColors.primary,
color: "#FFFFFF", color: "#FFFFFF",
cursorAlpha: 0.5 cursorAlpha: 0.5
}, },