From 35c01be9460918a9cff25176da5a19f6cfe32686 Mon Sep 17 00:00:00 2001 From: gconsidine Date: Fri, 4 Aug 2017 13:47:54 -0400 Subject: [PATCH] Fix a few colors out of sync w/ style guide * Darken tab background * lighten panel dismiss icon * make input buttons f2f2f2 like input backgrounds --- awx/ui/client/lib/theme/_mixins.less | 2 +- awx/ui/client/lib/theme/_variables.less | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/lib/theme/_mixins.less b/awx/ui/client/lib/theme/_mixins.less index 90a898be9b..147cb75a7e 100644 --- a/awx/ui/client/lib/theme/_mixins.less +++ b/awx/ui/client/lib/theme/_mixins.less @@ -34,7 +34,7 @@ &, &:active, &:hover, &:focus { color: @at-color-button-text-default; border-color: @at-color-input-border; - background-color: @at-gray-light-2x; + background-color: @at-color-input-button; cursor: pointer; } } diff --git a/awx/ui/client/lib/theme/_variables.less b/awx/ui/client/lib/theme/_variables.less index ea5240ebed..d42c2af8c5 100644 --- a/awx/ui/client/lib/theme/_variables.less +++ b/awx/ui/client/lib/theme/_variables.less @@ -47,8 +47,8 @@ @at-color-button-border-default: @at-gray-dark-2x; @at-color-button-text-default: @at-gray-dark-5x; -@at-color-tab-default-active: @at-gray-dark-2x; -@at-color-tab-border-default-active: @at-gray-dark-2x; +@at-color-tab-default-active: @at-gray-dark-4x; +@at-color-tab-border-default-active: @at-gray-dark-4x; @at-color-tab-text-default-active: @at-white; @at-color-tab-default-disabled: @at-white; @@ -57,19 +57,20 @@ @at-color-form-label: @at-gray-dark-5x; +@at-color-input-background: @at-gray-light-3x; @at-color-input-border: @at-gray-dark-2x; +@at-color-input-button: @at-gray-light-3x; +@at-color-input-disabled: @at-gray-light; @at-color-input-error: @at-color-error; @at-color-input-focus: @at-color-info; @at-color-input-hint: @at-gray-dark-4x; @at-color-input-icon: @at-gray-dark-2x; @at-color-input-placeholder: @at-gray-dark-4x; @at-color-input-text: @at-gray-dark-6x; -@at-color-input-background: @at-gray-light-3x; -@at-color-input-disabled: @at-gray-light-2x; @at-color-icon-dismiss: @at-gray-dark; @at-color-icon-popover: @at-gray-dark-4x; -@at-color-icon-hover: @at-gray-dark-5x; +@at-color-icon-hover: @at-gray-dark-4x; @at-color-panel-heading: @at-gray-dark-5x; @at-color-panel-border: @at-gray-dark-2x;