From 8adca4583ec95ac063f79990ac092998f24415b8 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 18 Dec 2012 22:57:56 -0800
Subject: CHUI-600 : WIP : Flash conversation item in different color than
 select and start flashing only when shown

---
 indra/newview/skins/default/colors.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 05230b8bd5..becdbda067 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -11,6 +11,9 @@
 	<color
 	 name="EmphasisColor_35"
 	 value="0.38 0.694 0.573 0.35" />
+	<color
+	 name="BeaconColor"
+    value="1 .67 .2 1" />	 
 	<color
 	 name="White"
 	 value="1 1 1 1" />
@@ -522,6 +525,9 @@
     <color
      name="MenuItemHighlightBgColor"
      reference="EmphasisColor_35" />
+    <color
+     name="MenuItemFlashBgColor"
+     reference="BeaconColor" />
     <color
      name="MenuItemHighlightFgColor"
      reference="White" />
-- 
cgit v1.2.3


From dcfcc191dd3caaa84d0f789a928a83adf55c13b1 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 19 Dec 2012 12:45:59 -0800
Subject: Pull merge from richard/viewer-chui

---
 indra/newview/skins/default/colors.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index c3df04d0a6..becdbda067 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -11,9 +11,6 @@
 	<color
 	 name="EmphasisColor_35"
 	 value="0.38 0.694 0.573 0.35" />
-    <color
-    name="BeaconColor"
-    value="1 .67 .2 1" />	 
 	<color
 	 name="BeaconColor"
     value="1 .67 .2 1" />	 
-- 
cgit v1.2.3


From c81cf89086b0282121c6577b6fde75e050c1a0e8 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Wed, 19 Dec 2012 17:10:31 -0800
Subject: CHUI-600 : Fix the orange (provided by Leo), fix the conversation
 item flashing (when shown)

---
 indra/newview/skins/default/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index becdbda067..0de217fc0d 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -13,7 +13,7 @@
 	 value="0.38 0.694 0.573 0.35" />
 	<color
 	 name="BeaconColor"
-    value="1 .67 .2 1" />	 
+    value="0.749 0.298 0 1" />	 
 	<color
 	 name="White"
 	 value="1 1 1 1" />
-- 
cgit v1.2.3