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 99edea97d5..77e4c3c2ef 100644 --- a/awx/ui/client/src/bread-crumb/bread-crumb.block.less +++ b/awx/ui/client/src/bread-crumb/bread-crumb.block.less @@ -1,26 +1,28 @@ +@import "../shared/branding/colors.default.less"; + /** @define BreadCrumb */ .BreadCrumb { padding: 0; display: flex; - background-color: #FFFFFF; + background-color: @bc-bg; width: 100%; z-index: 1039; position: fixed; right: 0; left: 0; - top: 50px; + top: 60px; height: 40px; - border-bottom: 1px solid #e1e1e1; + border-bottom: 1px solid @bc-border; } .BreadCrumb.is-loggedOut { opacity: 0; } .BreadCrumb-menuLink { width: 58px; - border-left: 1px solid #e1e1e1; + border-left: 1px solid @bc-link-side; margin-left: auto; - color: #d7d7d7; + color: @bc-link-icon; flex: initial; display: flex; align-items: center; @@ -28,11 +30,11 @@ cursor: pointer; } .BreadCrumb-menuLink:hover { - background-color: #f6f6f6; - color: #d7d7d7; + background-color: @bc-link-bg-hov; + color: @bc-link-icon; } .BreadCrumb-menuLink.BreadCrumb-menuLinkActive { - color: #1678c4; + color: @bc-link-icon-focus; } .BreadCrumb-menuLinkImage { font-size: 18px; diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less index 1c854a30dc..a29476fd90 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less @@ -1,3 +1,5 @@ +@import "../../shared/branding/colors.default.less"; + /** @define DashboardCounts */ .DashboardCounts { @@ -18,8 +20,8 @@ padding-left: 15px; padding-right: 15px; border-radius: 5px; - background-color: #fff; - border: 1px solid #e1e1e1; + background-color: @db-panel-bg; + border: 1px solid @db-panel-border; flex: 1 0 auto; max-width: ~"calc(16.6% - 15px)"; flex-basis: ~"calc(16.6% - 15px)"; @@ -41,22 +43,22 @@ } .DashboardCounts-buttonStyle:hover { - background-color: #1778c3; - border-color: #1778c3; + background-color: @db-count-succ; + border-color: @db-count-succ; .DashboardCounts-number, .DashboardCounts-label { - color: #fff; + color: @db-count-label-hov; } } .DashboardCounts-buttonStyle.is-failure:hover { - background-color: #ff5850; - border-color: #ff5850; + background-color: @db-count-fail; + border-color: @db-count-fail; .DashboardCounts-number, .DashboardCounts-label { - color: #fff; + color: @db-count-label-hov; } } @@ -68,13 +70,13 @@ } .DashboardCounts-number.is-failure { - color: #ff5850; + color: @db-count-fail; } .DashboardCounts-label { flex: 1; margin-bottom: 0px; - color: #848992; + color: @db-count-label; text-transform: uppercase; transition: color 0.2s; } diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less index 8a5e49ab1a..12d6b1f39a 100644 --- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less +++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.block.less @@ -1,12 +1,13 @@ /** @define DashboardGraphs */ @import "../../shared/branding/colors.less"; +@import "../../shared/branding/colors.default.less"; .DashboardGraphs { margin-top: 20px; - border: solid 1px #e1e1e1; + border: solid 1px @db-panel-border; border-radius: 5px; - background-color: #ffffff; + background-color: @db-panel-bg; padding-top:20px; padding-left: 20px; padding-right: 20px; @@ -22,10 +23,10 @@ } .DashboardGraphs-tab { - color: #b7b7b7; - background-color: #ffffff; + color: @btn-txt; + background-color: @btn-bg; font-size: 12px; - border: 1px solid #e1e1e1; + border: 1px solid @btn-bord; height: 30px; border-radius: 5px; margin-right: 20px; @@ -49,30 +50,32 @@ } .DashboardGraphs-tab:hover { - color: #b7b7b7; - background-color: #f6f6f6; + color: @btn-txt; + background-color: @btn-bg-hov; cursor: pointer; } .DashboardGraphs-tab:active { - color: #b7b7b7; - background-color: #d7d7d7; + color: @btn-txt-sel; + background-color: @btn-bg-sel; cursor: pointer; } .DashboardGraphs-tab:focus { - color: #b7b7b7; + color: @btn-txt-sel; } .DashboardGraphs-tab.is-selected { - color: #ffffff; - background-color: #d7d7d7; + color: @btn-txt-sel; + background-color: @btn-bg-sel; + border-color: @btn-bord-sel; } .DashboardGraphs-graphSection { display: block; flex: 1; padding-top:20px; + margin-bottom: -20px; } .DashboardGraphs-graphContainer { @@ -86,13 +89,13 @@ } .DashboardGraphs-filterLabelIcon{ - color: #d7d7d7; + color: @db-graph-per-dd-icon; font-size: 14px; padding-top: 5px; } .DashboardGraphs-filterLabel{ - color: #d7d7d7; + color: @db-graph-per-dd-txt; font-size: 12px; padding-right: 10px; padding-left: 10px; @@ -110,12 +113,12 @@ .nv-axislabel { font-weight: bold !important; - fill: #b7b7b7 !important; + fill: @db-graph-axis-label !important; font-family: 'Open Sans' !important; } .nv-axis text { - fill: #b7b7b7 !important; //rgb(169, 178, 189); + fill: @db-graph-axis-label !important; //rgb(169, 178, 189); font-family: 'Open Sans' !important; } @@ -125,28 +128,33 @@ flex-wrap: wrap; } +.DashboardGraphs-filterDropdownText, +.DashboardGraphs-filterDropdownText:hover, +.DashboardGraphs-filterDropdownText:focus, +.DashboardGraphs-filterDropdownText:active { + color: @db-graph-per-dd-txt; +} + .DashboardGraphs-filterDropdownText { flex: initial; - color: #b7b7b7; - background-color: #ffffff; + background-color: @db-graph-per-dd-bg; font-size: 12px; text-transform: uppercase; white-space: nowrap; padding-right: 10px; padding-left: 10px; height: 20px; - border: 1px solid #e1e1e1; + border: 1px solid @db-graph-per-dd-bord; border-radius: 5px; transition: background-color 0.2s; } .DashboardGraphs-filterDropdownText:hover { - color: #b7b7b7; - background-color: #f6f6f6; + background-color: @db-graph-per-dd-bg-hov; } .DashboardGraphs-filterIcon{ - color: #d7d7d7; + color: @db-graph-per-dd-icon; font-size: 14px; width: 20px; padding-left:10px; @@ -183,14 +191,14 @@ } .DashboardGraphs-statusFilter{ - color: #b7b7b7; - background-color: #ffffff; + color: @btn-txt; + background-color: @btn-bg; font-size: 12px; text-transform: uppercase; padding-right: 10px; padding-left: 10px; height: 20px; - border: 1px solid #e1e1e1; + border: 1px solid @btn-bord; border-radius: 5px; transition: background-color 0.2s; margin-left: 10px; @@ -199,12 +207,13 @@ .DashboardGraphs-statusFilter:hover{ cursor: pointer; - background-color: #f6f6f6; + background-color: @btn-bg-hov; } .DashboardGraphs-statusFilter.is-selected { - color: #ffffff; - background-color: #d7d7d7; + color: @btn-txt-sel; + background-color: @btn-bg-sel; + border-color: @btn-bord-sel; } .DashboardGraphs-hostStatusLabel--successful{ diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html index d8b7f49206..f7bb5bd7b7 100644 --- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html +++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html @@ -11,7 +11,6 @@ Host Status