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

fix(colorScheme): remove redundant color shades

pull/46/head
KostyaDanovsky 2016-05-16 12:14:53 +03:00
parent 99425ca91e
commit f50a7adbbf
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@
.controller('TrafficChartCtrl', TrafficChartCtrl); .controller('TrafficChartCtrl', TrafficChartCtrl);
/** @ngInject */ /** @ngInject */
function TrafficChartCtrl($scope, baConfig) { function TrafficChartCtrl($scope, baConfig, colorHelper) {
$scope.transparent = baConfig.theme.blur; $scope.transparent = baConfig.theme.blur;
var dashboardColors = baConfig.colors.dashboard; var dashboardColors = baConfig.colors.dashboard;
@ -17,35 +17,35 @@
{ {
value: 2000, value: 2000,
color: dashboardColors.white, color: dashboardColors.white,
highlight: dashboardColors.whiteDark, highlight: colorHelper.shade(dashboardColors.white, 15),
label: 'Other', label: 'Other',
percentage: 87, percentage: 87,
order: 1, order: 1,
}, { }, {
value: 1500, value: 1500,
color: dashboardColors.blueStone, color: dashboardColors.blueStone,
highlight: dashboardColors.blueStoneDark, highlight: colorHelper.shade(dashboardColors.blueStone, 15),
label: 'Search engines', label: 'Search engines',
percentage: 22, percentage: 22,
order: 4, order: 4,
}, { }, {
value: 1000, value: 1000,
color: dashboardColors.surfieGreen, color: dashboardColors.surfieGreen,
highlight: dashboardColors.surfieGreenDark, highlight: colorHelper.shade(dashboardColors.surfieGreen, 15),
label: 'Referral Traffic', label: 'Referral Traffic',
percentage: 70, percentage: 70,
order: 3, order: 3,
}, { }, {
value: 1200, value: 1200,
color: dashboardColors.silverTree, color: dashboardColors.silverTree,
highlight: dashboardColors.silverTreeDark, highlight: colorHelper.shade(dashboardColors.silverTree, 15),
label: 'Direct Traffic', label: 'Direct Traffic',
percentage: 38, percentage: 38,
order: 2, order: 2,
}, { }, {
value: 400, value: 400,
color: dashboardColors.gossip, color: dashboardColors.gossip,
highlight: dashboardColors.gossipDark, highlight: colorHelper.shade(dashboardColors.gossip, 15),
label: 'Ad Campaigns', label: 'Ad Campaigns',
percentage: 17, percentage: 17,
order: 0, order: 0,

6
src/app/theme/theme.configProvider.js
View File

@ -69,12 +69,6 @@
silverTree: dashboardColors.silverTree, silverTree: dashboardColors.silverTree,
gossip: dashboardColors.gossip, gossip: dashboardColors.gossip,
white: dashboardColors.white, white: dashboardColors.white,
blueStoneDark: colorHelper.shade(dashboardColors.blueStone, 15),
surfieGreenDark: colorHelper.shade(dashboardColors.surfieGreen, 15),
silverTreeDark: colorHelper.shade(dashboardColors.silverTree, 15),
gossipDark: colorHelper.shade(dashboardColors.gossip, 15),
whiteDark: colorHelper.shade(dashboardColors.white, 5),
}, },
} }
}; };