From d54a39deebad126dc1a610c06867e49019680ba3 Mon Sep 17 00:00:00 2001 From: KostyaDanovsky Date: Fri, 6 May 2016 20:10:01 +0300 Subject: [PATCH] fix(dashboard): use color from constants for pie charts --- .../dashboard/dashboardPieChart/DashboardPieChartCtrl.js | 4 ++-- src/app/theme/services/baUtil.js | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js b/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js index 633f281..c77b8dd 100644 --- a/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js +++ b/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js @@ -9,8 +9,8 @@ .controller('DashboardPieChartCtrl', DashboardPieChartCtrl); /** @ngInject */ - function DashboardPieChartCtrl($scope, $timeout, layoutColors) { - var pieColor = 'rgba(255, 255, 255, 0.4)'; + function DashboardPieChartCtrl($scope, $timeout, layoutColors, baUtil) { + var pieColor = baUtil.hexToRGB(layoutColors.defaultText, 0.2); $scope.charts = [{ color: pieColor, description: 'New Visits', diff --git a/src/app/theme/services/baUtil.js b/src/app/theme/services/baUtil.js index 146a4cd..6c2ccfb 100644 --- a/src/app/theme/services/baUtil.js +++ b/src/app/theme/services/baUtil.js @@ -22,6 +22,11 @@ return false; }; + this.hexToRGB = function(hex, alpha) { + var r = parseInt( hex.slice(1,3), 16 ); + var g = parseInt( hex.slice(3,5), 16 ); + var b = parseInt( hex.slice(5,7), 16 ); + return 'rgba(' + r + ', ' + g + ', ' + b + ', ' + alpha + ')'; + } } - })();