From 32c426421cd215cba6c8da621e91cf6d5f0ce8ea Mon Sep 17 00:00:00 2001
From: KostyaDanovsky <kostya.danovsky@gmail.com>
Date: Fri, 13 May 2016 11:08:07 +0300
Subject: [PATCH] fix(colorScheme): remove unused color variables
---
src/app/pages/maps/map-lines/MapLinesPageCtrl.js | 4 ++--
src/app/theme/amChartConfig.js | 6 +++---
src/app/theme/chartJsConfig.js | 2 +-
src/app/theme/theme.constants.js | 6 ------
4 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
index ec94a7a..8f18935 100644
--- a/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
+++ b/src/app/pages/maps/map-lines/MapLinesPageCtrl.js
@@ -252,12 +252,12 @@
},
imagesSettings: {
- color: layoutColors.warningBg,
+ color: layoutColors.warningLight,
selectedColor: layoutColors.warning
},
linesSettings: {
- color: layoutColors.warningBg,
+ color: layoutColors.warningLight,
alpha: 0.8
},
diff --git a/src/app/theme/amChartConfig.js b/src/app/theme/amChartConfig.js
index 6994f3e..6b50c9b 100644
--- a/src/app/theme/amChartConfig.js
+++ b/src/app/theme/amChartConfig.js
@@ -20,15 +20,15 @@
},
AmCoordinateChart: {
- colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg, layoutColors.warningDark]
+ colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.primaryLight, layoutColors.warningDark]
},
AmStockChart: {
- colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg, layoutColors.warningDark]
+ colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.primaryLight, layoutColors.warningDark]
},
AmSlicedChart: {
- colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.successBg, layoutColors.warningDark],
+ colors: [layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.primaryDark, layoutColors.warningLight, layoutColors.successDark, layoutColors.successLight, layoutColors.primaryLight, layoutColors.warningDark],
labelTickColor: "#FFFFFF",
labelTickAlpha: 0.3
},
diff --git a/src/app/theme/chartJsConfig.js b/src/app/theme/chartJsConfig.js
index 2dcae04..2d6084d 100644
--- a/src/app/theme/chartJsConfig.js
+++ b/src/app/theme/chartJsConfig.js
@@ -12,7 +12,7 @@
function chartJsConfig(ChartJsProvider, layoutColors) {
// Configure all charts
ChartJsProvider.setOptions({
- colours: [ layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.successBg],
+ colours: [ layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.primaryLight],
responsive: true,
scaleFontColor: layoutColors.defaultText,
scaleLineColor: layoutColors.border,
diff --git a/src/app/theme/theme.constants.js b/src/app/theme/theme.constants.js
index 682583e..c0994c1 100644
--- a/src/app/theme/theme.constants.js
+++ b/src/app/theme/theme.constants.js
@@ -62,12 +62,6 @@
warningDark: shade(colorScheme.warning, 15),
dangerDark: shade(colorScheme.danger, 15),
- primaryBg: tint(colorScheme.primary, 20),
- infoBg: tint(colorScheme.info, 20),
- successBg: tint(colorScheme.success, 20),
- warningBg: tint(colorScheme.warning, 20),
- dangerBg: tint(colorScheme.danger, 20),
-
dashboard: {
blueStone: dashboardColors.blueStone,
surfieGreen: dashboardColors.surfieGreen,