From 1f0470e33404408c6228c9d0e3753f7ba43d3d96 Mon Sep 17 00:00:00 2001
From: Chuck Linden <chuck@lindenlab.com>
Date: Wed, 20 Jan 2010 15:44:34 -0500
Subject: Finished layout of appearance editor.
 http://jira.secondlife.com/browse/EXT-146

---
 indra/newview/skins/default/xui/en/widgets/color_swatch.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index bda88857ae..dfd301a770 100644
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@@ -3,6 +3,6 @@
               border_color="ColorSwatchBorderColor"
               name="color_swatch">
   <color_swatch.caption_text name="caption"
-                             font="SansSerifSmall"
+                             halign="center"
                              follows="left|right|bottom"/>
 </color_swatch>
-- 
cgit v1.2.3


From 07625b49f232c8d91de989c5e3c33fac72b4bc07 Mon Sep 17 00:00:00 2001
From: Erica <erica@lindenlab.com>
Date: Wed, 20 Jan 2010 14:23:28 -0800
Subject: EXT-4543 Edit layout and art of chicklet button

---
 .../skins/default/xui/en/widgets/chiclet_im_adhoc.xml | 13 +++++++++++--
 .../skins/default/xui/en/widgets/chiclet_im_group.xml | 16 ++++++++++++----
 .../skins/default/xui/en/widgets/chiclet_im_p2p.xml   | 19 ++++++++++++++-----
 .../skins/default/xui/en/widgets/chiclet_offer.xml    | 12 ++++++++++--
 .../skins/default/xui/en/widgets/chiclet_panel.xml    |  4 ++--
 .../skins/default/xui/en/widgets/chiclet_script.xml   | 12 ++++++++++--
 6 files changed, 59 insertions(+), 17 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/widgets')

diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
index 693c43f141..dcfaeb449b 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml
@@ -4,6 +4,13 @@
  name="im_adhoc_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_adhoc.chiclet_button
+     height="25"
+     image_selected="PushButton_On"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25" />
     <chiclet_im_adhoc.speaker
      auto_update="true"
      draw_border="false"
@@ -13,11 +20,13 @@
      visible="false"
      width="20" />
     <chiclet_im_adhoc.avatar_icon
+     bottom="3"
      follows="left|top|bottom"
-     height="22"
+     height="20"
+     left="2"
      mouse_opaque="true"
      name="adhoc_icon"
-     width="22" />
+     width="21" />
     <chiclet_im_adhoc.unread_notifications
      font_halign="center"
      height="25"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
index f4fc58701c..de37b5b94e 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml
@@ -4,6 +4,13 @@
  name="im_group_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_group.chiclet_button
+     height="25"
+     image_selected="PushButton_On"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25" />
     <chiclet_im_group.speaker
      auto_update="true"
      draw_border="false"
@@ -13,13 +20,14 @@
      visible="false"
      width="20" />
     <chiclet_im_group.group_icon
+     bottom="3"
      default_icon="Generic_Group"
      follows="left|top|bottom"
-     height="18"
-  bottom_pad="4"
-     mouse_opaque="true"
+     height="20"
+     left="2"
+     mouse_opaque="false"
      name="group_icon"
-     width="18" />
+     width="21" />
     <chiclet_im_group.unread_notifications
      height="25"
      font_halign="center"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
index 535113f717..8233c4b488 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml
@@ -4,6 +4,13 @@
  name="im_p2p_chiclet"
  show_speaker="false"
  width="25">
+    <chiclet_im_p2p.chiclet_button
+     height="25"
+     image_selected="PushButton_On"
+     image_unselected="PushButton_Off"
+     name="chiclet_button"
+     tab_stop="false"
+     width="25"/>
     <chiclet_im_p2p.speaker
      auto_update="true"
      draw_border="false"
@@ -11,13 +18,15 @@
      left="25"
      name="speaker"
      visible="false"
-     width="20"/>
+     width="20" />
     <chiclet_im_p2p.avatar_icon
+     bottom="3"
      follows="left|top|bottom"
-     height="22"
-     mouse_opaque="true"
+     height="20"
+     left="2"
+     mouse_opaque="false"
      name="avatar_icon"
-     width="22" />
+     width="21" />
     <chiclet_im_p2p.unread_notifications
      height="25"
      font_halign="center"
@@ -36,4 +45,4 @@
   name="new_message_icon"
   visible="false"
   width="14" />
-</chiclet_im_p2p>
\ No newline at end of file
+</chiclet_im_p2p>
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
index 86bea9be50..8918120918 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_offer.xml
@@ -3,14 +3,22 @@
  height="25"
  name="offer_chiclet"
  width="25">
+ <chiclet_offer.chiclet_button
+  height="25"
+  image_selected="PushButton_On"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25" />
  <chiclet_offer.icon
+  bottom="3"
   default_icon="Generic_Object_Small"
   follows="all"
   height="20"
+  left="2"
   mouse_opaque="false"
   name="chiclet_icon"
-  bottom_pad="2"
-  width="20" />
+  width="21" />
  <chiclet_offer.new_message_icon
   bottom="11"
   height="14"
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
index f3207ddeae..5f51f4afd9 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_panel.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <chiclet_panel
- name="chiclet_panel" 
+ name="chiclet_panel"
  chiclet_padding="3"
  scrolling_offset="40"
- scroll_button_hpad="5"
+ scroll_button_hpad="0"
  scroll_ratio="10"
  min_width="180"
  />
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
index b1f9f5b0e8..8e3541231d 100644
--- a/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chiclet_script.xml
@@ -3,14 +3,22 @@
  height="25"
  name="script_chiclet"
  width="25">
+ <chiclet_script.chiclet_button
+  height="25"
+  image_selected="PushButton_On"
+  image_unselected="PushButton_Off"
+  name="chiclet_button"
+  tab_stop="false"
+  width="25"/>
  <chiclet_script.icon
+  bottom="3"
   follows="all"
   height="20"
   image_name="Generic_Object_Small"
+  left="2"
   mouse_opaque="false"
   name="chiclet_icon"
-  width="20"
-  bottom_pad="2" />
+ width="21"/>
  <chiclet_script.new_message_icon
   bottom="11"
   height="14"
-- 
cgit v1.2.3