diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-05-16 04:50:06 -0400 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-05-16 04:50:06 -0400 |
| commit | 374b1e58d415c5e2525a45654893516c798c5f44 (patch) | |
| tree | 11b7944932cda25cb24cd8b4964be23dc45adbac /www/js | |
| parent | ac0837bd6e9db58164b404076bd5ef677a4dac09 (diff) | |
#249 - new color scheme
Former-commit-id: f4b8c44e19d528ee37ff4cfcee11610e908c0105
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/PortalLoginCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/TimelineCtrl.js | 2 | ||||
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/www/js/PortalLoginCtrl.js b/www/js/PortalLoginCtrl.js index 4f8df895..b5a3cea0 100644 --- a/www/js/PortalLoginCtrl.js +++ b/www/js/PortalLoginCtrl.js @@ -157,7 +157,7 @@ angular.module('zmApp.controllers').controller('zmApp.PortalLoginCtrl', ['$ionic zmAutoLogin.start(); // PIN is fine, or not set so lets login - zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i> authenticating...</button>") + zmAutoLogin.doLogin("<button class='button button-clear' style='line-height: normal; min-height: 0; min-width: 0;color:#fff;' ng-click='$root.cancelAuth()'><i class='ion-close-circled'></i> authenticating...</button>") .then(function (data) // success { ZMDataModel.zmDebug("PortalLogin: auth success"); diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 241c1170..b6b053b4 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -386,7 +386,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla //flat colors for graph - https://flatuicolors.com http://www.flatuicolorpicker.com - var colors = ['#3498db', '#D2527F', '#f39c12', '#9b59b6', '#e74c3c', '#7A942E', ]; + var colors = ['#3498db', '#E57373', '#EB974E', '#95A5A6', '#e74c3c', '#03C9A9', ]; var container; container = angular.element(document.getElementById('visualization')); diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index 58891ef9..1cb49561 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -249,15 +249,15 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' { label: 'Score', fill:true, - backgroundColor: 'rgba(129, 207, 224, 1.0)', - borderColor: 'rgb(92, 147, 159)', + backgroundColor: 'rgba(52, 152, 219, 1.0)', + borderColor: 'rgba(52, 152, 219, 1.0)', borderCapStyle: 'butt', borderJoinStyle: 'miter', - pointBorderColor: "rgba(220,220,220,1)", + pointBorderColor: "#e74c3c", pointBackgroundColor: "#e74c3c", pointHoverRadius: 10, - pointHoverBackgroundColor: "#f39c12", + pointHoverBackgroundColor: "rgba(249, 105, 14,1.0)", pointHoverBorderWidth: 1, tension: 0.1, @@ -273,10 +273,10 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' datasets: [ { label: 'Score', - backgroundColor: 'rgba(129, 207, 224, 1.0)', - borderColor: 'rgba(129, 207, 224, 1.0)', - hoverBackgroundColor: 'rgba(248, 148, 6,1.0)', - hoverBorderColor: 'rgba(248, 148, 6,1.0)', + backgroundColor: 'rgba(52, 152, 219, 1.0)', + borderColor: 'rgba(52, 152, 219, 1.0)', + hoverBackgroundColor: 'rgba(249, 105, 14,1.0)', + hoverBorderColor: 'rgba(249, 105, 14,1.0)', data: [], frames: [] }, |