refacor(amCharts): remove borders and fix colors

johnny5tw · Feb 18, 2016 · 2e487f3 · 2e487f3
1 parent 2362f0a
commit 2e487f3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/app/pages/charts/amCharts/combinedChart/combinedChartCtrl.js b/src/app/pages/charts/amCharts/combinedChart/combinedChartCtrl.js
@@ -37,8 +37,8 @@
         "id": "g3",
         color: layoutColors.default,
         "valueAxis": "v1",
-        "lineColor": layoutColors.infoCharts,
-        "fillColors": layoutColors.infoCharts,
+        "lineColor": layoutColors.primaryBg,
+        "fillColors": layoutColors.primaryBg,
         "fillAlphas": 1,
         "type": "column",
         "title": "Actual Sales",
@@ -52,8 +52,8 @@
         "id": "g4",
         "valueAxis": "v1",
         color: layoutColors.default,
-        "lineColor": layoutColors.primaryCharts,
-        "fillColors": layoutColors.primaryCharts,
+        "lineColor": layoutColors.primaryLight,
+        "fillColors": layoutColors.primaryLight,
         "fillAlphas": 1,
         "type": "column",
         "title": "Target Sales",
@@ -72,7 +72,7 @@
         "bulletSize": 5,
         "hideBulletsCount": 50,
         "lineThickness": 2,
-        "lineColor": layoutColors.success,
+        "lineColor": layoutColors.danger,
         "type": "smoothedLine",
         "title": "Market Days",
         "useLineColorForBulletBorder": true,
@@ -88,7 +88,7 @@
         "bulletSize": 5,
         "hideBulletsCount": 50,
         "lineThickness": 2,
-        "lineColor": layoutColors.primary,
+        "lineColor": layoutColors.warning,
         "type": "smoothedLine",
         "dashLength": 5,
         "title": "Market Days ALL",

diff --git a/src/app/theme/amChartConfig.js b/src/app/theme/amChartConfig.js
@@ -20,17 +20,15 @@
       },
 
       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: {
-        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: {
-        colors: [layoutColors.$primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.successBg],
-        outlineAlpha: 1,
-        outlineThickness: 2,
+        colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg],
         labelTickColor: "#FFFFFF",
         labelTickAlpha: 0.3
       },
@@ -59,7 +57,7 @@
       },
 
       ChartCursor: {
-        cursorColor: layoutColors.dangerCharts,
+        cursorColor: layoutColors.primary,
         color: "#FFFFFF",
         cursorAlpha: 0.5
       },