diff --git a/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js b/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js index 91e6089..f12d780 100644 --- a/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js +++ b/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js @@ -10,7 +10,7 @@ /** @ngInject */ function DashboardCalendarCtrl(layoutColors) { - var palette = layoutColors.bgColorPalette; + var dashboardColors = layoutColors.dashboard; var $element = $('#calendar').fullCalendar({ //height: 335, header: { @@ -40,23 +40,23 @@ { title: 'All Day Event', start: '2016-03-01', - color: palette.silverTree + color: dashboardColors.silverTree }, { title: 'Long Event', start: '2016-03-07', end: '2016-03-10', - color: palette.blueStone + color: dashboardColors.blueStone }, { title: 'Dinner', start: '2016-03-14T20:00:00', - color: palette.surfieGreen + color: dashboardColors.surfieGreen }, { title: 'Birthday Party', start: '2016-04-01T07:00:00', - color: palette.gossipDark + color: dashboardColors.gossipDark } ] }); diff --git a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js b/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js index 82f3104..73d1faa 100644 --- a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js +++ b/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js @@ -12,10 +12,10 @@ function DashboardTodoCtrl($scope, layoutColors, layoutTheme) { $scope.transparent = layoutTheme.blur; - var palette = layoutColors.bgColorPalette; + var dashboardColors = layoutColors.dashboard; var colors = []; - for (var key in palette) { - colors.push(palette[key]); + for (var key in dashboardColors) { + colors.push(dashboardColors[key]); } function getRandomColor() { diff --git a/src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js b/src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js index 644b82b..2e52662 100644 --- a/src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js +++ b/src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js @@ -12,40 +12,40 @@ function TrafficChartCtrl($scope, layoutColors, layoutTheme) { $scope.transparent = layoutTheme.blur; - var palette = layoutColors.bgColorPalette; + var dashboardColors = layoutColors.dashboard; $scope.doughnutData = [ { value: 2000, - color: palette.white, - highlight: palette.whiteDark, + color: dashboardColors.white, + highlight: dashboardColors.whiteDark, label: 'Other', percentage: 87, order: 1, }, { value: 1500, - color: palette.blueStone, - highlight: palette.blueStoneDark, + color: dashboardColors.blueStone, + highlight: dashboardColors.blueStoneDark, label: 'Search engines', percentage: 22, order: 4, }, { value: 1000, - color: palette.surfieGreen, - highlight: palette.surfieGreenDark, + color: dashboardColors.surfieGreen, + highlight: dashboardColors.surfieGreenDark, label: 'Referral Traffic', percentage: 70, order: 3, }, { value: 1200, - color: palette.silverTree, - highlight: palette.silverTreeDark, + color: dashboardColors.silverTree, + highlight: dashboardColors.silverTreeDark, label: 'Direct Traffic', percentage: 38, order: 2, }, { value: 400, - color: palette.gossip, - highlight: palette.gossipDark, + color: dashboardColors.gossip, + highlight: dashboardColors.gossipDark, label: 'Ad Campaigns', percentage: 17, order: 0, diff --git a/src/app/theme/theme.constants.js b/src/app/theme/theme.constants.js index 5caa0d1..682583e 100644 --- a/src/app/theme/theme.constants.js +++ b/src/app/theme/theme.constants.js @@ -25,8 +25,8 @@ danger: '#e85656', }; - // background color palette - var bgColorPalette = { + // dashboard colors for charts + var dashboardColors = { blueStone: '#005562', surfieGreen: '#0e8174', silverTree: '#6eba8c', @@ -68,18 +68,18 @@ warningBg: tint(colorScheme.warning, 20), dangerBg: tint(colorScheme.danger, 20), - bgColorPalette: { - blueStone: bgColorPalette.blueStone, - surfieGreen: bgColorPalette.surfieGreen, - silverTree: bgColorPalette.silverTree, - gossip: bgColorPalette.gossip, - white: bgColorPalette.white, - - blueStoneDark: shade(bgColorPalette.blueStone, 15), - surfieGreenDark: shade(bgColorPalette.surfieGreen, 15), - silverTreeDark: shade(bgColorPalette.silverTree, 15), - gossipDark: shade(bgColorPalette.gossip, 15), - whiteDark: shade(bgColorPalette.white, 5), + dashboard: { + blueStone: dashboardColors.blueStone, + surfieGreen: dashboardColors.surfieGreen, + silverTree: dashboardColors.silverTree, + gossip: dashboardColors.gossip, + white: dashboardColors.white, + + blueStoneDark: shade(dashboardColors.blueStone, 15), + surfieGreenDark: shade(dashboardColors.surfieGreen, 15), + silverTreeDark: shade(dashboardColors.silverTree, 15), + gossipDark: shade(dashboardColors.gossip, 15), + whiteDark: shade(dashboardColors.white, 5), }, }) .constant('layoutSizes', {