diff --git a/src/app/pages/charts/amCharts/amCharts.module.js b/src/app/pages/charts/amCharts/amCharts.module.js
index 13600b5..2bbebf2 100644
--- a/src/app/pages/charts/amCharts/amCharts.module.js
+++ b/src/app/pages/charts/amCharts/amCharts.module.js
@@ -6,7 +6,7 @@
'use strict';
angular.module('BlurAdmin.pages.charts.amCharts', [])
- .config(routeConfig);
+ .config(routeConfig).config(amChartConfig);
/** @ngInject */
function routeConfig($stateProvider) {
@@ -21,4 +21,205 @@
});
}
+ function amChartConfig(baConfigProvider) {
+ var layoutColors = baConfigProvider.colors;
+ AmCharts.themes.blur = {
+
+ themeName: "blur",
+
+ AmChart: {
+ color: layoutColors.defaultText,
+ backgroundColor: "#FFFFFF"
+ },
+
+ AmCoordinateChart: {
+ 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.primaryLight, layoutColors.warningDark]
+ },
+
+ AmSlicedChart: {
+ 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
+ },
+
+ AmRectangularChart: {
+ zoomOutButtonColor: '#FFFFFF',
+ zoomOutButtonRollOverAlpha: 0.15,
+ zoomOutButtonImage: "lens.png"
+ },
+
+ AxisBase: {
+ axisColor: "#FFFFFF",
+ axisAlpha: 0.3,
+ gridAlpha: 0.1,
+ gridColor: "#FFFFFF"
+ },
+
+ ChartScrollbar: {
+ backgroundColor: "#FFFFFF",
+ backgroundAlpha: 0.12,
+ graphFillAlpha: 0.5,
+ graphLineAlpha: 0,
+ selectedBackgroundColor: "#FFFFFF",
+ selectedBackgroundAlpha: 0.4,
+ gridAlpha: 0.15
+ },
+
+ ChartCursor: {
+ cursorColor: layoutColors.primary,
+ color: "#FFFFFF",
+ cursorAlpha: 0.5
+ },
+
+ AmLegend: {
+ color: "#FFFFFF"
+ },
+
+ AmGraph: {
+ lineAlpha: 0.9
+ },
+ GaugeArrow: {
+ color: "#FFFFFF",
+ alpha: 0.8,
+ nailAlpha: 0,
+ innerRadius: "40%",
+ nailRadius: 15,
+ startWidth: 15,
+ borderAlpha: 0.8,
+ nailBorderAlpha: 0
+ },
+
+ GaugeAxis: {
+ tickColor: "#FFFFFF",
+ tickAlpha: 1,
+ tickLength: 15,
+ minorTickLength: 8,
+ axisThickness: 3,
+ axisColor: '#FFFFFF',
+ axisAlpha: 1,
+ bandAlpha: 0.8
+ },
+
+ TrendLine: {
+ lineColor: layoutColors.danger,
+ lineAlpha: 0.8
+ },
+
+ // ammap
+ AreasSettings: {
+ alpha: 0.8,
+ color: layoutColors.info,
+ colorSolid: layoutColors.primaryDark,
+ unlistedAreasAlpha: 0.4,
+ unlistedAreasColor: "#FFFFFF",
+ outlineColor: "#FFFFFF",
+ outlineAlpha: 0.5,
+ outlineThickness: 0.5,
+ rollOverColor: layoutColors.primary,
+ rollOverOutlineColor: "#FFFFFF",
+ selectedOutlineColor: "#FFFFFF",
+ selectedColor: "#f15135",
+ unlistedAreasOutlineColor: "#FFFFFF",
+ unlistedAreasOutlineAlpha: 0.5
+ },
+
+ LinesSettings: {
+ color: "#FFFFFF",
+ alpha: 0.8
+ },
+
+ ImagesSettings: {
+ alpha: 0.8,
+ labelColor: "#FFFFFF",
+ color: "#FFFFFF",
+ labelRollOverColor: layoutColors.primaryDark
+ },
+
+ ZoomControl: {
+ buttonFillAlpha: 0.8,
+ buttonIconColor: layoutColors.defaultText,
+ buttonRollOverColor: layoutColors.danger,
+ buttonFillColor: layoutColors.primaryDark,
+ buttonBorderColor: layoutColors.primaryDark,
+ buttonBorderAlpha: 0,
+ buttonCornerRadius: 0,
+ gridColor: "#FFFFFF",
+ gridBackgroundColor: "#FFFFFF",
+ buttonIconAlpha: 0.6,
+ gridAlpha: 0.6,
+ buttonSize: 20
+ },
+
+ SmallMap: {
+ mapColor: "#000000",
+ rectangleColor: layoutColors.danger,
+ backgroundColor: "#FFFFFF",
+ backgroundAlpha: 0.7,
+ borderThickness: 1,
+ borderAlpha: 0.8
+ },
+
+ // the defaults below are set using CSS syntax, you can use any existing css property
+ // if you don't use Stock chart, you can delete lines below
+ PeriodSelector: {
+ color: "#FFFFFF"
+ },
+
+ PeriodButton: {
+ color: "#FFFFFF",
+ background: "transparent",
+ opacity: 0.7,
+ border: "1px solid rgba(0, 0, 0, .3)",
+ MozBorderRadius: "5px",
+ borderRadius: "5px",
+ margin: "1px",
+ outline: "none",
+ boxSizing: "border-box"
+ },
+
+ PeriodButtonSelected: {
+ color: "#FFFFFF",
+ backgroundColor: "#b9cdf5",
+ border: "1px solid rgba(0, 0, 0, .3)",
+ MozBorderRadius: "5px",
+ borderRadius: "5px",
+ margin: "1px",
+ outline: "none",
+ opacity: 1,
+ boxSizing: "border-box"
+ },
+
+ PeriodInputField: {
+ color: "#FFFFFF",
+ background: "transparent",
+ border: "1px solid rgba(0, 0, 0, .3)",
+ outline: "none"
+ },
+
+ DataSetSelector: {
+ color: "#FFFFFF",
+ selectedBackgroundColor: "#b9cdf5",
+ rollOverBackgroundColor: "#a8b0e4"
+ },
+
+ DataSetCompareList: {
+ color: "#FFFFFF",
+ lineHeight: "100%",
+ boxSizing: "initial",
+ webkitBoxSizing: "initial",
+ border: "1px solid rgba(0, 0, 0, .3)"
+ },
+
+ DataSetSelect: {
+ border: "1px solid rgba(0, 0, 0, .3)",
+ outline: "none"
+ }
+
+ };
+ }
+
})();
diff --git a/src/app/pages/charts/chartJs/chartJs.module.js b/src/app/pages/charts/chartJs/chartJs.module.js
index 32c5d34..4bc24c6 100644
--- a/src/app/pages/charts/chartJs/chartJs.module.js
+++ b/src/app/pages/charts/chartJs/chartJs.module.js
@@ -6,7 +6,7 @@
'use strict';
angular.module('BlurAdmin.pages.charts.chartJs', [])
- .config(routeConfig);
+ .config(routeConfig).config(chartJsConfig);
/** @ngInject */
function routeConfig($stateProvider) {
@@ -21,4 +21,20 @@
});
}
+ function chartJsConfig(ChartJsProvider, baConfigProvider) {
+ var layoutColors = baConfigProvider.colors;
+ // 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.primaryLight],
+ responsive: true,
+ scaleFontColor: layoutColors.defaultText,
+ scaleLineColor: layoutColors.border,
+ pointLabelFontColor: layoutColors.defaultText
+ });
+ // Configure all line charts
+ ChartJsProvider.setOptions('Line', {
+ datasetFill: false
+ });
+ }
+
})();
\ No newline at end of file
diff --git a/src/app/theme/amChartConfig.js b/src/app/theme/amChartConfig.js
deleted file mode 100644
index 17f987a..0000000
--- a/src/app/theme/amChartConfig.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * @author v.lugovsky
- * created on 15.12.2015
- */
-(function () {
- 'use strict';
-
- angular.module('BlurAdmin.theme')
- .config(amChartConfig);
-
- /** @ngInject */
- function amChartConfig(baConfigProvider) {
- var layoutColors = baConfigProvider.colors;
- AmCharts.themes.blur = {
-
- themeName: "blur",
-
- AmChart: {
- color: layoutColors.defaultText,
- backgroundColor: "#FFFFFF"
- },
-
- AmCoordinateChart: {
- 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.primaryLight, layoutColors.warningDark]
- },
-
- AmSlicedChart: {
- 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
- },
-
- AmRectangularChart: {
- zoomOutButtonColor: '#FFFFFF',
- zoomOutButtonRollOverAlpha: 0.15,
- zoomOutButtonImage: "lens.png"
- },
-
- AxisBase: {
- axisColor: "#FFFFFF",
- axisAlpha: 0.3,
- gridAlpha: 0.1,
- gridColor: "#FFFFFF"
- },
-
- ChartScrollbar: {
- backgroundColor: "#FFFFFF",
- backgroundAlpha: 0.12,
- graphFillAlpha: 0.5,
- graphLineAlpha: 0,
- selectedBackgroundColor: "#FFFFFF",
- selectedBackgroundAlpha: 0.4,
- gridAlpha: 0.15
- },
-
- ChartCursor: {
- cursorColor: layoutColors.primary,
- color: "#FFFFFF",
- cursorAlpha: 0.5
- },
-
- AmLegend: {
- color: "#FFFFFF"
- },
-
- AmGraph: {
- lineAlpha: 0.9
- },
- GaugeArrow: {
- color: "#FFFFFF",
- alpha: 0.8,
- nailAlpha: 0,
- innerRadius: "40%",
- nailRadius: 15,
- startWidth: 15,
- borderAlpha: 0.8,
- nailBorderAlpha: 0
- },
-
- GaugeAxis: {
- tickColor: "#FFFFFF",
- tickAlpha: 1,
- tickLength: 15,
- minorTickLength: 8,
- axisThickness: 3,
- axisColor: '#FFFFFF',
- axisAlpha: 1,
- bandAlpha: 0.8
- },
-
- TrendLine: {
- lineColor: layoutColors.danger,
- lineAlpha: 0.8
- },
-
- // ammap
- AreasSettings: {
- alpha: 0.8,
- color: layoutColors.info,
- colorSolid: layoutColors.primaryDark,
- unlistedAreasAlpha: 0.4,
- unlistedAreasColor: "#FFFFFF",
- outlineColor: "#FFFFFF",
- outlineAlpha: 0.5,
- outlineThickness: 0.5,
- rollOverColor: layoutColors.primary,
- rollOverOutlineColor: "#FFFFFF",
- selectedOutlineColor: "#FFFFFF",
- selectedColor: "#f15135",
- unlistedAreasOutlineColor: "#FFFFFF",
- unlistedAreasOutlineAlpha: 0.5
- },
-
- LinesSettings: {
- color: "#FFFFFF",
- alpha: 0.8
- },
-
- ImagesSettings: {
- alpha: 0.8,
- labelColor: "#FFFFFF",
- color: "#FFFFFF",
- labelRollOverColor: layoutColors.primaryDark
- },
-
- ZoomControl: {
- buttonFillAlpha: 0.8,
- buttonIconColor: layoutColors.defaultText,
- buttonRollOverColor: layoutColors.danger,
- buttonFillColor: layoutColors.primaryDark,
- buttonBorderColor: layoutColors.primaryDark,
- buttonBorderAlpha: 0,
- buttonCornerRadius: 0,
- gridColor: "#FFFFFF",
- gridBackgroundColor: "#FFFFFF",
- buttonIconAlpha: 0.6,
- gridAlpha: 0.6,
- buttonSize: 20
- },
-
- SmallMap: {
- mapColor: "#000000",
- rectangleColor: layoutColors.danger,
- backgroundColor: "#FFFFFF",
- backgroundAlpha: 0.7,
- borderThickness: 1,
- borderAlpha: 0.8
- },
-
- // the defaults below are set using CSS syntax, you can use any existing css property
- // if you don't use Stock chart, you can delete lines below
- PeriodSelector: {
- color: "#FFFFFF"
- },
-
- PeriodButton: {
- color: "#FFFFFF",
- background: "transparent",
- opacity: 0.7,
- border: "1px solid rgba(0, 0, 0, .3)",
- MozBorderRadius: "5px",
- borderRadius: "5px",
- margin: "1px",
- outline: "none",
- boxSizing: "border-box"
- },
-
- PeriodButtonSelected: {
- color: "#FFFFFF",
- backgroundColor: "#b9cdf5",
- border: "1px solid rgba(0, 0, 0, .3)",
- MozBorderRadius: "5px",
- borderRadius: "5px",
- margin: "1px",
- outline: "none",
- opacity: 1,
- boxSizing: "border-box"
- },
-
- PeriodInputField: {
- color: "#FFFFFF",
- background: "transparent",
- border: "1px solid rgba(0, 0, 0, .3)",
- outline: "none"
- },
-
- DataSetSelector: {
- color: "#FFFFFF",
- selectedBackgroundColor: "#b9cdf5",
- rollOverBackgroundColor: "#a8b0e4"
- },
-
- DataSetCompareList: {
- color: "#FFFFFF",
- lineHeight: "100%",
- boxSizing: "initial",
- webkitBoxSizing: "initial",
- border: "1px solid rgba(0, 0, 0, .3)"
- },
-
- DataSetSelect: {
- border: "1px solid rgba(0, 0, 0, .3)",
- outline: "none"
- }
-
- };
- }
-
-})();
diff --git a/src/app/theme/chartJsConfig.js b/src/app/theme/chartJsConfig.js
deleted file mode 100644
index e866de2..0000000
--- a/src/app/theme/chartJsConfig.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @author a.demeshko
- * created on 12/16/15
- */
-(function () {
- 'use strict';
-
- angular.module('BlurAdmin.theme')
- .config(chartJsConfig);
-
- /** @ngInject */
- function chartJsConfig(ChartJsProvider, baConfigProvider) {
- var layoutColors = baConfigProvider.colors;
- // 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.primaryLight],
- responsive: true,
- scaleFontColor: layoutColors.defaultText,
- scaleLineColor: layoutColors.border,
- pointLabelFontColor: layoutColors.defaultText
- });
- // Configure all line charts
- ChartJsProvider.setOptions('Line', {
- datasetFill: false
- });
- }
-
-})();
\ No newline at end of file
diff --git a/src/app/theme/toastrLibConfig.js b/src/app/theme/components/toastrLibConfig.js
similarity index 91%
rename from src/app/theme/toastrLibConfig.js
rename to src/app/theme/components/toastrLibConfig.js
index 94593b1..ec67fa4 100644
--- a/src/app/theme/toastrLibConfig.js
+++ b/src/app/theme/components/toastrLibConfig.js
@@ -5,7 +5,7 @@
(function () {
'use strict';
- angular.module('BlurAdmin.theme')
+ angular.module('BlurAdmin.theme.components')
.config(toastrLibConfig);
/** @ngInject */
diff --git a/src/app/theme/theme.config.js b/src/app/theme/theme.config.js
index 163a889..aa8274e 100644
--- a/src/app/theme/theme.config.js
+++ b/src/app/theme/theme.config.js
@@ -17,7 +17,5 @@
colors.defaultText = '#666666';
colors.dashboard.white = '#10c4b5';
colors.dashboard.whiteDark = colorHelper.shade(colors.dashboard.white, 5);
-
- console.log(baConfigProvider);
}
})();
diff --git a/src/sass/app/_alerts.scss b/src/sass/app/_alerts.scss
index f136b1a..9d3a79f 100644
--- a/src/sass/app/_alerts.scss
+++ b/src/sass/app/_alerts.scss
@@ -27,6 +27,7 @@
.bg-success {
background-color: rgba($success,0.85);
+ color: $label-text;
a{
color: $danger-dark;
&:hover{
@@ -36,6 +37,7 @@
}
.bg-info {
background-color: rgba($info,0.85);
+ color: $label-text;
a{
color: $warning-light;
&:hover{
@@ -45,6 +47,7 @@
}
.bg-warning {
background-color: rgba($warning,0.85);
+ color: $label-text;
a{
color: $danger-dark;
&:hover{
@@ -54,6 +57,7 @@
}
.bg-danger {
background-color: rgba($danger,0.85);
+ color: $label-text;
a{
color: $warning-light;
&:hover{
diff --git a/src/sass/app/_modals.scss b/src/sass/app/_modals.scss
index 287fc6d..baf71fe 100644
--- a/src/sass/app/_modals.scss
+++ b/src/sass/app/_modals.scss
@@ -76,7 +76,7 @@ $modal-input-border: #e7e7e7;
}
.modal-content .modal-header .modal-title{
- color: $label-text;
+ color: $default-text;
}
.message-modal {