' + Math.floor(y.replace(',','')) + ' Hosts ' + '
'; }) .labelType("percent") - .color(['#00aa00', '#aa0000']); + .color(['#60D66F', '#ff5850']); d3.select(element.find('svg')[0]) .datum(data) diff --git a/awx/ui/static/js/directives/job-status-graph.js b/awx/ui/static/js/directives/job-status-graph.js index d33080bd8f..f154379c84 100644 --- a/awx/ui/static/js/directives/job-status-graph.js +++ b/awx/ui/static/js/directives/job-status-graph.js @@ -46,12 +46,12 @@ function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustG scope.jobType = jobtype; var timeFormat, graphData = [ - { "color": "#00aa00", + { "color": "#60D66F", "key": "Successful", "values": data.jobs.successful }, { "key" : "Failed" , - "color" : "#aa0000", + "color" : "#ff5850", "values": data.jobs.failed } ]; diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js index 3603302f45..74d84d51f9 100644 --- a/awx/ui/static/js/helpers/JobDetail.js +++ b/awx/ui/static/js/helpers/JobDetail.js @@ -1146,7 +1146,7 @@ export default graph_data.push({ label: 'OK', value: (scope.host_summary.ok === scope.host_summary.total) ? 1 : scope.host_summary.ok, - color: '#00aa00' + color: '#60D66F' }); } if (scope.host_summary.changed) { @@ -1167,7 +1167,7 @@ export default graph_data.push({ label: 'Failed', value: (scope.host_summary.failed === scope.host_summary.total) ? 1 : scope.host_summary.failed, - color: '#aa0000' + color: '#ff5850' }); } diff --git a/awx/ui/static/js/smart-status/smart-status.directive.js b/awx/ui/static/js/smart-status/smart-status.directive.js index b1fdd84e4d..f3fca643ed 100644 --- a/awx/ui/static/js/smart-status/smart-status.directive.js +++ b/awx/ui/static/js/smart-status/smart-status.directive.js @@ -23,8 +23,8 @@ export default [ function() { barWidth: 7, barSpacing: 2, zeroBarColor: 'grey', - posBarColor: '#00aa00', - negBarColor: '#aa0000', + posBarColor: '#60D66F', + negBarColor: '#ff5850', tooltipFormatter: scope.formatter, tooltipFormat: '{{value:jobs}}', tooltipValueLookups: { diff --git a/awx/ui/static/js/widgets/DashboardCounts.js b/awx/ui/static/js/widgets/DashboardCounts.js index ec79822ac4..cc8bcac3ee 100644 --- a/awx/ui/static/js/widgets/DashboardCounts.js +++ b/awx/ui/static/js/widgets/DashboardCounts.js @@ -45,13 +45,13 @@ angular.module('DashboardCountsWidget', ['RestServices', 'Utilities']) element.html(html); $compile(element)(scope); if(dashboard.hosts.failed>0 ){ - $('#failed-hosts').replaceWith(""+dashboard.hosts.failed+""); + $('#failed-hosts').replaceWith(""+dashboard.hosts.failed+""); } if(dashboard.inventories.inventory_failed>0 ){ - $('#failed-inventories').replaceWith(""+dashboard.inventories.inventory_failed+""); + $('#failed-inventories').replaceWith(""+dashboard.inventories.inventory_failed+""); } if(dashboard.projects.failed>0 ){ - $('#failed-projects').replaceWith(""+dashboard.projects.failed+""); + $('#failed-projects').replaceWith(""+dashboard.projects.failed+""); } scope.$emit('WidgetLoaded'); diff --git a/awx/ui/static/js/widgets/HostPieChart.js b/awx/ui/static/js/widgets/HostPieChart.js index 80d6143d83..29625e0ea3 100644 --- a/awx/ui/static/js/widgets/HostPieChart.js +++ b/awx/ui/static/js/widgets/HostPieChart.js @@ -63,12 +63,12 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities']) data = [ { "label": "Successful", - "color": "#00aa00", + "color": "#60D66F", "value" : dashboard.hosts.total } , { "label": "Failed", - "color" : "#aa0000", + "color" : "#ff5850", "value" : dashboard.hosts.failed } ]; @@ -85,7 +85,7 @@ angular.module('HostPieChartWidget', ['RestServices', 'Utilities']) .tooltipContent(function(x, y) { return ''+x+''+ '' + Math.floor(y.replace(',','')) + ' Hosts ' + '
'; }) - .color(['#00aa00', '#aa0000']); + .color(['#60D66F', '#ff5850']); host_pie_chart.pie.pieLabelsOutside(true).labelType("percent"); diff --git a/awx/ui/static/js/widgets/JobStatusGraph.js b/awx/ui/static/js/widgets/JobStatusGraph.js index eee5ffd14a..d83098a55c 100644 --- a/awx/ui/static/js/widgets/JobStatusGraph.js +++ b/awx/ui/static/js/widgets/JobStatusGraph.js @@ -117,13 +117,13 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) var timeFormat, graphData = [ { - "color": "#00aa00", + "color": "#60D66F", "key": "Successful", "values": data.jobs.successful }, { "key" : "Failed" , - "color" : "#aa0000", + "color" : "#ff5850", "values": data.jobs.failed } ]; @@ -216,4 +216,4 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities']) }; } - ]); \ No newline at end of file + ]); diff --git a/awx/ui/static/less/ansible-ui.less b/awx/ui/static/less/ansible-ui.less index 646b11a1dc..804030907f 100644 --- a/awx/ui/static/less/ansible-ui.less +++ b/awx/ui/static/less/ansible-ui.less @@ -12,14 +12,11 @@ @blue: #1778c3; /* logo blue */ @blue-link: #1778c3; @blue-dark: #2a6496; /* link hover */ -@green: #00aa00; // Ansible OK @grey: #A9A9A9; @grey-txt: #707070; @info: #d9edf7; /* alert info background color */ @info-border: #bce8f1; /* alert info border color */ @info-color: #3a87ad; -@red: #aa0000; // Ansible Failed -@red-hover: #AE3F3A; @unreachable: #FF0000; @changed: #FF9900; // Ansible Changed @skipped: #00aaaa; // Ansible Skipped @@ -30,6 +27,10 @@ @tip-background: #0088CC; @tip-color: #fff; +@green: #60D66F; +@red: #ff5850; +@red-hover: #FA8C87; + @font-face { font-family: 'Open Sans'; @@ -365,6 +366,7 @@ textarea.allowresize { .prepend-asterisk:before { content: "\002A\00A0"; color: @red; + margin-right: -5px; } .subtitle {