From 6bbc6024e76b19594869c1a176610fe06a52de2d Mon Sep 17 00:00:00 2001 From: Leigh Johnson Date: Tue, 3 May 2016 12:51:55 -0400 Subject: [PATCH] change hard-coded color hexes to LESS vars --- awx/ui/client/src/footer/footer.block.less | 4 +++- .../src/scheduler/schedulerFormDetail.block.less | 2 +- awx/ui/client/src/shared/branding/colors.less | 14 ++++++++------ .../src/smart-status/smart-status.block.less | 4 ++-- 4 files changed, 14 insertions(+), 10 deletions(-) diff --git a/awx/ui/client/src/footer/footer.block.less b/awx/ui/client/src/footer/footer.block.less index ebe652d1c3..ddc4160a51 100644 --- a/awx/ui/client/src/footer/footer.block.less +++ b/awx/ui/client/src/footer/footer.block.less @@ -1,7 +1,9 @@ /** @define DashboardCounts */ +@import "awx/ui/client/src/shared/branding/colors.default.less"; + .Footer { height: 40px; - background-color: #f6f6f6; + background-color: @default-no-items-bord; color: #848992; width: 100%; z-index: 1040; diff --git a/awx/ui/client/src/scheduler/schedulerFormDetail.block.less b/awx/ui/client/src/scheduler/schedulerFormDetail.block.less index b607b250f6..13ff4a8af3 100644 --- a/awx/ui/client/src/scheduler/schedulerFormDetail.block.less +++ b/awx/ui/client/src/scheduler/schedulerFormDetail.block.less @@ -16,7 +16,7 @@ .SchedulerFormDetail-errorText { text-align: center; margin-bottom: 0px; - color: #ff5850; + color: @default-err; } .SchedulerFormDetail-label { diff --git a/awx/ui/client/src/shared/branding/colors.less b/awx/ui/client/src/shared/branding/colors.less index 839b79a174..b07d5eaf9e 100644 --- a/awx/ui/client/src/shared/branding/colors.less +++ b/awx/ui/client/src/shared/branding/colors.less @@ -1,10 +1,12 @@ +@import "awx/ui/client/src/shared/branding/colors.default.less"; + @active-color: #EDF2F2; // #c6e5e5; @black: #171717; @blue: #1778c3; /* logo blue */ @blue-link: #1778c3; @blue-dark: #2a6496; /* link hover */ @grey: #A9A9A9; -@grey-txt: #707070; +@grey-txt: @default-as-detail-txt; @grey-border: #DDDDDD; @info: #d9edf7; /* alert info background color */ @info-border: #bce8f1; /* alert info border color */ @@ -27,8 +29,8 @@ @tip-background: #0088CC; @tip-color: #fff; -@green: #3cb878; -@red: #ff5850; -@red-hover: #FA8C87; -@red-focus: #FF1105; -@ansible-red: #FF5850; +@green: @default-succ; +@red: @default-err; +@red-hover: @default-err-hov; +@red-focus: @default-err-hov; +@ansible-red: @default-err; 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 248993b217..d416271243 100644 --- a/awx/ui/client/src/smart-status/smart-status.block.less +++ b/awx/ui/client/src/smart-status/smart-status.block.less @@ -38,7 +38,7 @@ } .SmartStatus-tooltip--success{ - color: #3cb878; + color: @default-succ; padding-left: 5px; padding-right: 0px; text-shadow: @@ -50,7 +50,7 @@ } .SmartStatus-tooltip--failed{ - color: #ff5850; + color: @default-err; padding-left: 5px; padding-right: 0px; text-shadow: