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

refactor(dashboard): rename dashboard colors

pull/46/head
KostyaDanovsky 2016-05-12 17:32:46 +03:00 committed by kostya.danovsky
parent dee1333e06
commit a6a55a042e
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js
View File

@ -10,7 +10,7 @@
/** @ngInject */ /** @ngInject */
function DashboardCalendarCtrl(layoutColors) { function DashboardCalendarCtrl(layoutColors) {
var palette = layoutColors.bgColorPalette; var dashboardColors = layoutColors.dashboard;
var $element = $('#calendar').fullCalendar({ var $element = $('#calendar').fullCalendar({
//height: 335, //height: 335,
header: { header: {
@ -40,23 +40,23 @@
{ {
title: 'All Day Event', title: 'All Day Event',
start: '2016-03-01', start: '2016-03-01',
color: palette.silverTree color: dashboardColors.silverTree
}, },
{ {
title: 'Long Event', title: 'Long Event',
start: '2016-03-07', start: '2016-03-07',
end: '2016-03-10', end: '2016-03-10',
color: palette.blueStone color: dashboardColors.blueStone
}, },
{ {
title: 'Dinner', title: 'Dinner',
start: '2016-03-14T20:00:00', start: '2016-03-14T20:00:00',
color: palette.surfieGreen color: dashboardColors.surfieGreen
}, },
{ {
title: 'Birthday Party', title: 'Birthday Party',
start: '2016-04-01T07:00:00', start: '2016-04-01T07:00:00',
color: palette.gossipDark color: dashboardColors.gossipDark
} }
] ]
}); });

6
src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js
View File

@ -12,10 +12,10 @@
function DashboardTodoCtrl($scope, layoutColors, layoutTheme) { function DashboardTodoCtrl($scope, layoutColors, layoutTheme) {
$scope.transparent = layoutTheme.blur; $scope.transparent = layoutTheme.blur;
var palette = layoutColors.bgColorPalette; var dashboardColors = layoutColors.dashboard;
var colors = []; var colors = [];
for (var key in palette) { for (var key in dashboardColors) {
colors.push(palette[key]); colors.push(dashboardColors[key]);
} }
function getRandomColor() { function getRandomColor() {

22
src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js
View File

@ -12,40 +12,40 @@
function TrafficChartCtrl($scope, layoutColors, layoutTheme) { function TrafficChartCtrl($scope, layoutColors, layoutTheme) {
$scope.transparent = layoutTheme.blur; $scope.transparent = layoutTheme.blur;
var palette = layoutColors.bgColorPalette; var dashboardColors = layoutColors.dashboard;
$scope.doughnutData = [ $scope.doughnutData = [
{ {
value: 2000, value: 2000,
color: palette.white, color: dashboardColors.white,
highlight: palette.whiteDark, highlight: dashboardColors.whiteDark,
label: 'Other', label: 'Other',
percentage: 87, percentage: 87,
order: 1, order: 1,
}, { }, {
value: 1500, value: 1500,
color: palette.blueStone, color: dashboardColors.blueStone,
highlight: palette.blueStoneDark, highlight: dashboardColors.blueStoneDark,
label: 'Search engines', label: 'Search engines',
percentage: 22, percentage: 22,
order: 4, order: 4,
}, { }, {
value: 1000, value: 1000,
color: palette.surfieGreen, color: dashboardColors.surfieGreen,
highlight: palette.surfieGreenDark, highlight: dashboardColors.surfieGreenDark,
label: 'Referral Traffic', label: 'Referral Traffic',
percentage: 70, percentage: 70,
order: 3, order: 3,
}, { }, {
value: 1200, value: 1200,
color: palette.silverTree, color: dashboardColors.silverTree,
highlight: palette.silverTreeDark, highlight: dashboardColors.silverTreeDark,
label: 'Direct Traffic', label: 'Direct Traffic',
percentage: 38, percentage: 38,
order: 2, order: 2,
}, { }, {
value: 400, value: 400,
color: palette.gossip, color: dashboardColors.gossip,
highlight: palette.gossipDark, highlight: dashboardColors.gossipDark,
label: 'Ad Campaigns', label: 'Ad Campaigns',
percentage: 17, percentage: 17,
order: 0, order: 0,

26
src/app/theme/theme.constants.js
View File

@ -25,8 +25,8 @@
danger: '#e85656', danger: '#e85656',
}; };
// background color palette // dashboard colors for charts
var bgColorPalette = { var dashboardColors = {
blueStone: '#005562', blueStone: '#005562',
surfieGreen: '#0e8174', surfieGreen: '#0e8174',
silverTree: '#6eba8c', silverTree: '#6eba8c',
@ -68,18 +68,18 @@
warningBg: tint(colorScheme.warning, 20), warningBg: tint(colorScheme.warning, 20),
dangerBg: tint(colorScheme.danger, 20), dangerBg: tint(colorScheme.danger, 20),
bgColorPalette: { dashboard: {
blueStone: bgColorPalette.blueStone, blueStone: dashboardColors.blueStone,
surfieGreen: bgColorPalette.surfieGreen, surfieGreen: dashboardColors.surfieGreen,
silverTree: bgColorPalette.silverTree, silverTree: dashboardColors.silverTree,
gossip: bgColorPalette.gossip, gossip: dashboardColors.gossip,
white: bgColorPalette.white, white: dashboardColors.white,
blueStoneDark: shade(bgColorPalette.blueStone, 15), blueStoneDark: shade(dashboardColors.blueStone, 15),
surfieGreenDark: shade(bgColorPalette.surfieGreen, 15), surfieGreenDark: shade(dashboardColors.surfieGreen, 15),
silverTreeDark: shade(bgColorPalette.silverTree, 15), silverTreeDark: shade(dashboardColors.silverTree, 15),
gossipDark: shade(bgColorPalette.gossip, 15), gossipDark: shade(dashboardColors.gossip, 15),
whiteDark: shade(bgColorPalette.white, 5), whiteDark: shade(dashboardColors.white, 5),
}, },
}) })
.constant('layoutSizes', { .constant('layoutSizes', {