From 81fec1b7a20dc0f8f563fa5789a0a19861bce865 Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Tue, 3 May 2016 12:55:13 -0400 Subject: [PATCH] Updated hardcoded colors to LESS variables --- .../src/access/addPermissions/addPermissions.block.less | 2 +- awx/ui/client/src/bread-crumb/bread-crumb.block.less | 6 +++--- awx/ui/client/src/dashboard/dashboard.block.less | 3 ++- .../client/src/dashboard/lists/dashboard-list.block.less | 2 +- awx/ui/client/src/footer/footer.block.less | 8 ++++---- awx/ui/client/src/main-menu/main-menu.block.less | 8 ++++---- .../client/src/management-jobs/card/mgmtcards.block.less | 7 ++++--- awx/ui/client/src/notifications/notifications.block.less | 4 +++- awx/ui/client/src/organizations/orgcards.block.less | 7 ++++--- awx/ui/client/src/scheduler/scheduleToggle.block.less | 2 +- awx/ui/client/src/setup-menu/setup-item.block.less | 4 ++-- awx/ui/client/src/shared/download-standard-out.block.less | 5 +++-- awx/ui/client/src/smart-status/smart-status.block.less | 2 +- awx/ui/client/src/standard-out/standard-out.block.less | 2 +- .../system-tracking/date-picker/date-picker.block.less | 5 +++-- .../fact-data-table/fact-data-table.block.less | 4 ++-- .../src/system-tracking/fact-module-filter.block.less | 2 +- 17 files changed, 40 insertions(+), 33 deletions(-) diff --git a/awx/ui/client/src/access/addPermissions/addPermissions.block.less b/awx/ui/client/src/access/addPermissions/addPermissions.block.less index 87e4e0ee2b..9352a04192 100644 --- a/awx/ui/client/src/access/addPermissions/addPermissions.block.less +++ b/awx/ui/client/src/access/addPermissions/addPermissions.block.less @@ -80,7 +80,7 @@ .AddPermissions-directions { margin-top: 10px; margin-bottom: 20px; - color: #848992; + color: @default-interface-txt; display: flex; align-items: center; } diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.block.less b/awx/ui/client/src/bread-crumb/bread-crumb.block.less index de05b2f113..9a492972fc 100644 --- a/awx/ui/client/src/bread-crumb/bread-crumb.block.less +++ b/awx/ui/client/src/bread-crumb/bread-crumb.block.less @@ -44,21 +44,21 @@ .BreadCrumb-list { padding: 0px 20px; list-style: none; - background-color: #FFFFFF; + background-color: @default-bg; border-radius: 4px; line-height: 40px; } .BreadCrumb-item { display: inline-block; - color: #B7B7B7; + color: @default-data-txt; text-transform: uppercase; } .BreadCrumb-item + .BreadCrumb-item:before { content: "/"; padding: 0 5px; - color: #B7B7B7; + color: @default-data-txt; } @breadcrumb-breakpoint: 900px; diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index 29409a966d..25943d19f4 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -1,4 +1,5 @@ /** @define Dashboard */ +@import "awx/ui/client/src/shared/branding/colors.default.less"; .Dashboard { display: flex; @@ -22,7 +23,7 @@ border-radius: 5px; margin-top: 20px; width: 50%; - background-color: #ffffff; + background-color: @default-bg; max-width: ~"calc(50% - 10px)"; position: relative; } 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 a8b1ebed58..621d56aaf3 100644 --- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less +++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less @@ -146,7 +146,7 @@ .DashboardList-actionButton--edit:hover { background-color: #1678c4; - color: #ffffff; + color: @default-bg; border: 1px solid #1678c4; } diff --git a/awx/ui/client/src/footer/footer.block.less b/awx/ui/client/src/footer/footer.block.less index ddc4160a51..95ec11463d 100644 --- a/awx/ui/client/src/footer/footer.block.less +++ b/awx/ui/client/src/footer/footer.block.less @@ -1,10 +1,10 @@ /** @define DashboardCounts */ -@import "awx/ui/client/src/shared/branding/colors.default.less"; +@import "../../shared/branding/colors.default.less"; .Footer { height: 40px; background-color: @default-no-items-bord; - color: #848992; + color: @default-interface-txt; width: 100%; z-index: 1040; position: absolute; @@ -32,11 +32,11 @@ } .Footer-link:hover{ - color: #ffffff; + color: @default-bg; } .Footer-link{ - color: #848992; + color: @default-interface-txt; } .Footer-copyright.is-loggedOut, diff --git a/awx/ui/client/src/main-menu/main-menu.block.less b/awx/ui/client/src/main-menu/main-menu.block.less index d64b5de3d3..9a6649bbee 100644 --- a/awx/ui/client/src/main-menu/main-menu.block.less +++ b/awx/ui/client/src/main-menu/main-menu.block.less @@ -62,10 +62,10 @@ .MainMenu-socketImage { font-size: 18px; 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; z-index: 1042; } 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 87818f55e5..75e9f616dd 100644 --- a/awx/ui/client/src/management-jobs/card/mgmtcards.block.less +++ b/awx/ui/client/src/management-jobs/card/mgmtcards.block.less @@ -1,4 +1,5 @@ /** @define MgmtCards */ +@import '../shared/branding/colors.default.less'; .MgmtCards { display: flex; @@ -6,10 +7,10 @@ } .MgmtCards-card { - background-color: #fff; + background-color: @default-bg; padding: 20px; border-radius: 5px; - border: 1px solid #e8e8e8; + border: 1px solid @default-border; display: flex; flex-wrap: wrap; align-items: baseline; @@ -33,7 +34,7 @@ text-transform: uppercase; font-size: 14px; font-weight: bold; - color: #848992; + color: @default-interface-txt; margin-bottom: 25px; white-space: nowrap; } diff --git a/awx/ui/client/src/notifications/notifications.block.less b/awx/ui/client/src/notifications/notifications.block.less index 9ee78f9ae2..255be1795a 100644 --- a/awx/ui/client/src/notifications/notifications.block.less +++ b/awx/ui/client/src/notifications/notifications.block.less @@ -1,3 +1,5 @@ +@import "awx/ui/client/src/shared/branding/colors.default.less"; + .NotificationsForm-typeSelect{ flex: none; } @@ -8,7 +10,7 @@ .alert-success{ background-color: #3cb878; - color: #fff; + color: @default-bg; } .Toast-successIcon{ diff --git a/awx/ui/client/src/organizations/orgcards.block.less b/awx/ui/client/src/organizations/orgcards.block.less index 9ee5180381..1b47c8e8cb 100644 --- a/awx/ui/client/src/organizations/orgcards.block.less +++ b/awx/ui/client/src/organizations/orgcards.block.less @@ -1,4 +1,5 @@ /** @define OrgCards */ +@import '../shared/branding/colors.default.less'; .OrgCards { display: flex; @@ -6,11 +7,11 @@ } .OrgCards-card { - background-color: #fff; + background-color: @default-bg; padding: 20px; padding-bottom: 0px; border-radius: 5px; - border: 1px solid #e8e8e8; + border: 1px solid @default-border; display: flex; flex-wrap: wrap; align-items: baseline; @@ -34,7 +35,7 @@ text-transform: uppercase; font-size: 14px; font-weight: bold; - color: #848992; + color: @default-interface-txt; margin-bottom: 25px; white-space: nowrap; overflow: hidden; diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less index d83a7a0569..9f3a35c990 100644 --- a/awx/ui/client/src/scheduler/scheduleToggle.block.less +++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less @@ -26,7 +26,7 @@ .ScheduleToggle.is-on { border-color: #1678c4; - background-color: #fff; + background-color: @default-bg; } .ScheduleToggle-switch.is-on { diff --git a/awx/ui/client/src/setup-menu/setup-item.block.less b/awx/ui/client/src/setup-menu/setup-item.block.less index 8947b5f042..cbdeca89eb 100644 --- a/awx/ui/client/src/setup-menu/setup-item.block.less +++ b/awx/ui/client/src/setup-menu/setup-item.block.less @@ -20,7 +20,7 @@ .SetupItem-title{ font-size: 14px; - color: #848992; + color: @default-interface-txt; text-align: center; margin-bottom: 15px; font-weight: 600; @@ -29,7 +29,7 @@ .SetupItem-description{ font-size: 12px; - color: #848992; + color: @default-interface-txt; text-align: center; } diff --git a/awx/ui/client/src/shared/download-standard-out.block.less b/awx/ui/client/src/shared/download-standard-out.block.less index 7b8c2e9ec4..ff4e1de027 100644 --- a/awx/ui/client/src/shared/download-standard-out.block.less +++ b/awx/ui/client/src/shared/download-standard-out.block.less @@ -1,7 +1,8 @@ /** @define DownloadStandardOut */ +@import "awx/ui/client/src/shared/branding/colors.default.less"; .DownloadStandardOut { - color: #fff !important; + color: @default-bg !important; } .DownloadStandardOut--onStandardOutPage { @@ -16,7 +17,7 @@ } .DownloadStandardOut-icon { - color: #fff; + color: @default-bg; } .DownloadStandardOut-icon--withText { 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 d416271243..fdb80aaa65 100644 --- a/awx/ui/client/src/smart-status/smart-status.block.less +++ b/awx/ui/client/src/smart-status/smart-status.block.less @@ -61,7 +61,7 @@ } .SmartStatus-tooltip--running{ - color: #b7b7b7; + color: @default-data-txt; padding-left: 5px; padding-right: 0px; text-shadow: diff --git a/awx/ui/client/src/standard-out/standard-out.block.less b/awx/ui/client/src/standard-out/standard-out.block.less index f89811e108..836813df8a 100644 --- a/awx/ui/client/src/standard-out/standard-out.block.less +++ b/awx/ui/client/src/standard-out/standard-out.block.less @@ -81,7 +81,7 @@ font-size: 16px; height: 30px; min-width: 30px; - color: #b7b7b7; + color: @default-data-txt; background-color: inherit; border: none; border-radius: 50%; diff --git a/awx/ui/client/src/system-tracking/date-picker/date-picker.block.less b/awx/ui/client/src/system-tracking/date-picker/date-picker.block.less index e972128e06..8c601fdb85 100644 --- a/awx/ui/client/src/system-tracking/date-picker/date-picker.block.less +++ b/awx/ui/client/src/system-tracking/date-picker/date-picker.block.less @@ -1,4 +1,5 @@ /** @define DatePicker */ +@import "awx/ui/client/src/shared/branding/colors.default.less"; .DatePicker { flex: 1 0 auto; @@ -11,11 +12,11 @@ border-radius: 4px 0 0 4px; border: 1px solid #ccc; border-right: 0; - background-color: #fff; + background-color: @default-bg; } &-icon:hover { - background-color: #e8e8e8; + background-color: @default-border; } &-icon:focus, diff --git a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less index f2a2c74995..08e6b73297 100644 --- a/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less +++ b/awx/ui/client/src/system-tracking/fact-data-table/fact-data-table.block.less @@ -10,7 +10,7 @@ padding: .5em 0; align-items: center; transition: background-color 100ms, border-color 100ms; - border: solid 1px #fff; + border: solid 1px @default-bg; &:nth-child(even) { background-color: @default-no-items-bord; @@ -137,7 +137,7 @@ //margin-bottom: 0.5rem; background-color: @default-err; border: none; - color: #FFFFFF; + color: @default-bg; &:hover { background-color: @default-err; diff --git a/awx/ui/client/src/system-tracking/fact-module-filter.block.less b/awx/ui/client/src/system-tracking/fact-module-filter.block.less index 69ba915bf6..8aaf82d5f4 100644 --- a/awx/ui/client/src/system-tracking/fact-module-filter.block.less +++ b/awx/ui/client/src/system-tracking/fact-module-filter.block.less @@ -40,7 +40,7 @@ z-index: 2; background-color: @default-icon; - color: #fff; + color: @default-bg; border-color: @default-icon; &:active, &:focus {