From bf7a259f0b22a237a5151dfccb9c322416d6047e Mon Sep 17 00:00:00 2001
From: Ken Hoes <khoes@ansible.com>
Date: Tue, 3 May 2016 12:55:13 -0400
Subject: [PATCH] Updated hardcoded colors to LESS variables

---
 awx/ui/client/src/dashboard/dashboard.block.less            | 1 +
 awx/ui/client/src/dashboard/lists/dashboard-list.block.less | 4 ++--
 awx/ui/client/src/notifications/notifications.block.less    | 2 +-
 awx/ui/client/src/scheduler/scheduleToggle.block.less       | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less
index 75d9525040..151286d9f8 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 */
+<<<<<<< HEAD
 @import "../shared/branding/colors.default.less";
 
 .Dashboard {
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 89b266847f..4c25e4d4ad 100644
--- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
+++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
@@ -145,9 +145,9 @@
 }
 
 .DashboardList-actionButton--edit:hover {
-    background-color: #337AB7;
+    background-color: @default-link;
     color: @default-bg;
-    border: 1px solid #337AB7;
+    border: 1px solid @default-link;
 }
 
 .DashboardList-noJobs {
diff --git a/awx/ui/client/src/notifications/notifications.block.less b/awx/ui/client/src/notifications/notifications.block.less
index 0ca491aa08..d3ebf96651 100644
--- a/awx/ui/client/src/notifications/notifications.block.less
+++ b/awx/ui/client/src/notifications/notifications.block.less
@@ -9,7 +9,7 @@
 }
 
 .alert-success{
-    background-color: #5CB85C;
+    background-color: @default-succ;
     color: @default-bg;
 }
 
diff --git a/awx/ui/client/src/scheduler/scheduleToggle.block.less b/awx/ui/client/src/scheduler/scheduleToggle.block.less
index 84b3aa62cf..a4eb13612a 100644
--- a/awx/ui/client/src/scheduler/scheduleToggle.block.less
+++ b/awx/ui/client/src/scheduler/scheduleToggle.block.less
@@ -25,7 +25,7 @@
 }
 
 .ScheduleToggle.is-on {
-    border-color: #337AB7;
+    border-color: @default-link;
     background-color: @default-bg;
 }