From c1069775a40bb5bcf53027498692f4a09c0decd7 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 3 May 2016 13:05:49 -0400 Subject: [PATCH] fixed global colors --- awx/ui/client/src/shared/branding/colors.default.less | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 2e986fdb9f..7ee5f8bc4d 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -8,6 +8,7 @@ @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 +<<<<<<< HEAD @default-err: #D9534F; @default-err-hov: #C9302C; @default-succ: #5CB85C;