From a57faafcedc65f3e48046b7f496cc85996260dda Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 13:22:12 -0400 Subject: [PATCH] color fixing based on login modal --- .../job-status/job-status-graph.directive.js | 4 ++-- .../src/dashboard/lists/dashboard-list.block.less | 4 ++-- awx/ui/client/src/helpers/JobDetail.js | 2 +- .../src/management-jobs/card/mgmtcards.block.less | 2 +- .../src/notifications/notifications.block.less | 2 +- .../client/src/organizations/orgcards.block.less | 2 +- .../client/src/scheduler/scheduleToggle.block.less | 2 +- .../client/src/shared/branding/colors.default.less | 14 +++++++------- 8 files changed, 16 insertions(+), 16 deletions(-) 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 e9f9b03cae..428f63dfdb 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,12 +58,12 @@ function JobStatusGraph($rootScope, $compile , $location, $window, Wait, adjustG scope.status = status; var timeFormat, graphData = [ - { "color": "#3CB878", + { "color": "#5CB85C", "key": "SUCCESSFUL", "values": data.jobs.successful }, { "key" : "FAILED" , - "color" : "#ff5850", + "color" : "#D9534F", "values": data.jobs.failed } ]; 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 621d56aaf3..89b266847f 100644 --- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less +++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less @@ -145,9 +145,9 @@ } .DashboardList-actionButton--edit:hover { - background-color: #1678c4; + background-color: #337AB7; color: @default-bg; - border: 1px solid #1678c4; + border: 1px solid #337AB7; } .DashboardList-noJobs { diff --git a/awx/ui/client/src/helpers/JobDetail.js b/awx/ui/client/src/helpers/JobDetail.js index 90c68cc943..ab497f3386 100644 --- a/awx/ui/client/src/helpers/JobDetail.js +++ b/awx/ui/client/src/helpers/JobDetail.js @@ -955,7 +955,7 @@ export default graph_data.push({ label: 'FAILED', value: count.failures.length, - color: '#ff5850' + color: '#D9534F' }); } DonutChart({ diff --git a/awx/ui/client/src/management-jobs/card/mgmtcards.block.less b/awx/ui/client/src/management-jobs/card/mgmtcards.block.less index 75e9f616dd..4a98c2d5cf 100644 --- a/awx/ui/client/src/management-jobs/card/mgmtcards.block.less +++ b/awx/ui/client/src/management-jobs/card/mgmtcards.block.less @@ -19,7 +19,7 @@ .MgmtCards-card--selected { padding-left: 16px; - border-left: 5px solid #1678C4; + border-left: 5px solid #337AB7; } .MgmtCards-header { diff --git a/awx/ui/client/src/notifications/notifications.block.less b/awx/ui/client/src/notifications/notifications.block.less index 255be1795a..0ca491aa08 100644 --- a/awx/ui/client/src/notifications/notifications.block.less +++ b/awx/ui/client/src/notifications/notifications.block.less @@ -9,7 +9,7 @@ } .alert-success{ - background-color: #3cb878; + background-color: #5CB85C; color: @default-bg; } diff --git a/awx/ui/client/src/organizations/orgcards.block.less b/awx/ui/client/src/organizations/orgcards.block.less index 1b47c8e8cb..1ad3524e49 100644 --- a/awx/ui/client/src/organizations/orgcards.block.less +++ b/awx/ui/client/src/organizations/orgcards.block.less @@ -20,7 +20,7 @@ .OrgCards-card--selected { padding-left: 16px; - border-left: 5px solid #1678C4; + border-left: 5px solid #337AB7; } .OrgCards-header { diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less index 9f3a35c990..84b3aa62cf 100644 --- a/awx/ui/client/src/scheduler/scheduleToggle.block.less +++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less @@ -25,7 +25,7 @@ } .ScheduleToggle.is-on { - border-color: #1678c4; + border-color: #337AB7; background-color: @default-bg; } diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 0892d3efdb..f50f5cb441 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -8,13 +8,13 @@ @default-bg: #FFFFFF; // also selected btn txt @default-secondary-bg: #FCFCFC; // page/input field bg, just adds depth @default-tertiary-bg: #FAFAFA; // hover bg, alt-list -@default-err: #D9534F; // used to be FF5850 -@default-err-hov: #C9302C; // used to be FF1105 -@default-succ: #3CB878; //used to be 3CB878 -@default-succ-hov: #449D44; //used to be 60D66F +@default-err: #D9534F; +@default-err-hov: #C9302C; +@default-succ: #5CB85C; +@default-succ-hov: #449D44; @default-succ-disabled: #D7D7D7; // no different than other disableds...remove sometime -@default-link: #337AB7; // used to be 1678C4 -@default-link-hov: #286090; // used to be 4498DA +@default-link: #337AB7; +@default-link-hov: #286090; @default-list-header-bg:#EBEBEB; @default-no-items-bord: #F6F6F6; // also white button hovers @default-stdout-txt: #707070; @@ -106,7 +106,7 @@ // forms @field-label: @default-interface-txt; @field-input-text: @default-data-txt; -@field-bg: @default-tertiary-bg; +@field-bg: @default-secondary-bg; @field-secondary-bg: @default-secondary-bg; @field-border: @d7grey; @field-border-sel: @default-link;