diff --git a/awx/ui/client/src/dashboard/graphs/host-status/host-status-graph.directive.js b/awx/ui/client/src/dashboard/graphs/host-status/host-status-graph.directive.js index b6f5a8c5f6..87e2a82764 100644 --- a/awx/ui/client/src/dashboard/graphs/host-status/host-status-graph.directive.js +++ b/awx/ui/client/src/dashboard/graphs/host-status/host-status-graph.directive.js @@ -59,10 +59,10 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) { if(scope.status === "successful"){ data = [ { "label": "SUCCESSFUL", - "color": "#5bbdbf", + "color": "#3CB878", "value" : scope.data.hosts.total - scope.data.hosts.failed }]; - colors = ['#5bbdbf']; + colors = ['#3cb878']; } else if (scope.status === "failed"){ data = [{ "label": "FAILED", @@ -74,7 +74,7 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) { else { data = [ { "label": "SUCCESSFUL", - "color": "#5bbdbf", + "color": "#3CB878", "value" : scope.data.hosts.total - scope.data.hosts.failed } , { "label": "FAILED", @@ -82,7 +82,7 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) { "value" : scope.data.hosts.failed } ]; - colors = ['#5bbdbf', '#ff5850']; + colors = ['#3cb878', '#ff5850']; } host_pie_chart = nv.models.pieChart() @@ -114,7 +114,7 @@ function HostStatusGraph($compile, $window, adjustGraphSize, templateUrl) { color = "#ff5850"; } else{ - color = "#5bbdbf"; + color = "#3CB878"; } d3.select(element.find(".nv-label text")[0]) diff --git a/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js b/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js index c8297b6f48..f2fc2dae0b 100644 --- a/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js +++ b/awx/ui/client/src/dashboard/graphs/job-status/job-status-graph.directive.js @@ -58,7 +58,7 @@ function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustG scope.status = status; var timeFormat, graphData = [ - { "color": "#5bbdbf", + { "color": "#3CB878", "key": "SUCCESSFUL", "values": data.jobs.successful }, diff --git a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less index aa02e5fb1c..35a5974a33 100644 --- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less +++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less @@ -6,12 +6,12 @@ flex: 1; } .DashboardList--noJobTemplates { - color: @db-list-empty-txt; + color: @list-empty-txt; } .DashboardList-header { display: flex; - border-bottom: 1px solid @db-list-header-bord; + border-bottom: 1px solid @list-header-bord; height: 50px; } @@ -20,7 +20,7 @@ margin: 0px; font-size: 14px; font-weight: bold; - color: @db-list-header-txt; + color: @list-header-txt; height: 50px; line-height: 50px; white-space: nowrap; @@ -28,7 +28,7 @@ } .DashboardList-tableHeaderIcon { - color: @db-list-header-icon; + color: @list-header-icon; } .DashboardList-viewAll { @@ -72,8 +72,8 @@ font-size: 14px; font-weight: normal; text-transform: uppercase; - color: @db-list-header-txt; - background-color: @db-list-header-bg; + color: @list-header-txt; + background-color: @list-header-bg; } .DashboardList-tableHeader--name { @@ -104,11 +104,11 @@ .DashboardList-tableRow { height: 50px; font-size: 14px; - color: @db-list-item; + color: @list-item; } .DashboardList-tableRow--evenRow { - background-color: @db-list-alt-item-bg; + background-color: @list-alt-item-bg; } .DashboardList-status{ @@ -163,22 +163,22 @@ font-size: 16px; height: 30px; width: 30px; - color: @db-list-action-icon; - background-color: @db-list-actn-bg; - border: 1px solid @db-list-actn-bord; + color: @list-action-icon; + background-color: @list-actn-bg; + border: 1px solid @list-actn-bord; border-radius: 50%; transition: background-color 0.2s, border-color 0.2s, color 0.2s; } .DashboardList-tableRow--evenRow > .DashboardList-actionButtonCell > .DashboardList-actionButton { - background-color: @db-list-actn-alt-bg; - border: 1px solid @db-list-actn-alt-bord; + background-color: @list-actn-alt-bg; + border: 1px solid @list-actn-alt-bord; } .DashboardList-actionButton:hover { - background-color: @db-list-actn-bg-hov !important; - border: 1px solid @db-list-actn-bord-hov !important; - color: @db-list-actn-icn-hov; + background-color: @list-actn-bg-hov !important; + border: 1px solid @list-actn-bord-hov !important; + color: @list-actn-icn-hov; border: none; } @@ -193,5 +193,5 @@ } .DashboardList-noJobs { - color: @db-list-empty-txt; + color: @list-empty-txt; } diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index a006a2f021..07661c8b67 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -27,6 +27,26 @@ @btn-bord-sel: @default-icon-hov; @btn-txt-sel: @default-bg; +// lists +@list-empty-txt: @default-interface-txt; +@list-header-bord: @default-bg; +@list-header-bg: #EBEBEB; +@list-header-txt: @default-interface-txt; +@list-header-icon: @default-icon; +@list-item: @default-data-txt; +@list-item-link: @default-link; +@list-item-link-hov: @default-link-hov; +@list-item-bg: @default-bg; +@list-alt-item-bg: @default-tertiary-bg; +@list-action-icon: @default-icon; +@list-actn-bg: @default-bg; +@list-actn-bord: @default-bg; +@list-actn-alt-bg: @default-tertiary-bg; +@list-actn-alt-bord: @default-tertiary-bg; +@list-actn-icn-hov: @default-bg; +@list-actn-bg-hov: @default-link; +@list-actn-bord-hov: @default-link; + // tooltups @tooltip-bg: @default-interface-txt; @tooltip-txt: @default-bg; @@ -104,23 +124,3 @@ @db-graph-per-dd-bg-hov:@default-tertiary-bg; @db-graph-axis: @default-border; @db-graph-axis-label: @default-interface-txt; - -// dashboard lists -@db-list-empty-txt: @default-interface-txt; -@db-list-header-bord: @default-bg; -@db-list-header-bg: #EBEBEB; -@db-list-header-txt: @default-interface-txt; -@db-list-header-icon: @default-icon; -@db-list-item: @default-data-txt; -@db-list-item-link: @default-link; -@db-list-item-link-hov: @default-link-hov; -@db-list-item-bg: @default-bg; -@db-list-alt-item-bg: @default-tertiary-bg; -@db-list-action-icon: @default-icon; -@db-list-actn-bg: @default-bg; -@db-list-actn-bord: @default-bg; -@db-list-actn-alt-bg: @default-tertiary-bg; -@db-list-actn-alt-bord: @default-tertiary-bg; -@db-list-actn-icn-hov: @default-bg; -@db-list-actn-bg-hov: @default-link; -@db-list-actn-bord-hov: @default-link; diff --git a/awx/ui/client/src/shared/branding/colors.less b/awx/ui/client/src/shared/branding/colors.less index 36868068c4..4d9d801584 100644 --- a/awx/ui/client/src/shared/branding/colors.less +++ b/awx/ui/client/src/shared/branding/colors.less @@ -26,7 +26,7 @@ @tip-background: #0088CC; @tip-color: #fff; -@green: #5bbdbf; +@green: #3cb878; @red: #ff5850; @red-hover: #FA8C87; @red-focus: #FF1105; diff --git a/awx/ui/client/src/smart-status/smart-status.block.less b/awx/ui/client/src/smart-status/smart-status.block.less index d06feb41e7..248993b217 100644 --- a/awx/ui/client/src/smart-status/smart-status.block.less +++ b/awx/ui/client/src/smart-status/smart-status.block.less @@ -1,5 +1,6 @@ /** @define SmartStatus */ @import "awx/ui/client/legacy-styles/animations.less"; +@import "../shared/branding/colors.default.less"; .SmartStatus-container{ max-width: 165px; @@ -12,19 +13,19 @@ } .SmartStatus--success{ - color: #5bbdbf; + color: @default-succ; margin-bottom: 20px; padding: 0px; } .SmartStatus--failed{ - color: #ff5850; + color: @default-err; margin-top: 20px; padding: 0px; } .SmartStatus--running{ - color: #b7b7b7; + color: @default-icon; margin-top: 10px; padding: 0px; .pulsate(); @@ -37,14 +38,14 @@ } .SmartStatus-tooltip--success{ - color: #5bbdbf; + color: #3cb878; padding-left: 5px; padding-right: 0px; text-shadow: - -1px -1px 0 #fff, - 1px -1px 0 #fff, - -1px 1px 0 #fff, - 1px 1px 0 #fff; + -1px -1px 0 @default-bg, + 1px -1px 0 @default-bg, + -1px 1px 0 @default-bg, + 1px 1px 0 @default-bg; } @@ -53,10 +54,10 @@ padding-left: 5px; padding-right: 0px; text-shadow: - -1px -1px 0 #fff, - 1px -1px 0 #fff, - -1px 1px 0 #fff, - 1px 1px 0 #fff; + -1px -1px 0 @default-bg, + 1px -1px 0 @default-bg, + -1px 1px 0 @default-bg, + 1px 1px 0 @default-bg; } .SmartStatus-tooltip--running{ @@ -64,9 +65,9 @@ padding-left: 5px; padding-right: 0px; text-shadow: - -1px -1px 0 #fff, - 1px -1px 0 #fff, - -1px 1px 0 #fff, - 1px 1px 0 #fff; + -1px -1px 0 @default-bg, + 1px -1px 0 @default-bg, + -1px 1px 0 @default-bg, + 1px 1px 0 @default-bg; .pulsate(); }