diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index c739d4d4554d4808998ca3cb0e7dd6292877fa22..48ea09d7a2923099076093d6d5f0ec5d067e4b41 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<colors>
-
+
<!-- Named Colors -->
-
+
<color
name="EmphasisColor"
value="0.38 0.694 0.573 1" />
@@ -69,11 +69,11 @@
<color
name="Transparent"
value="0 0 0 0" />
-
-
-
+
+
+
<!-- UI Definitions -->
-
+
<color
name="AgentChatColor"
reference="LtGray" />
@@ -115,13 +115,13 @@
reference="LtGray" />
<color
name="ButtonLabelDisabledColor"
- reference="LtGray_50" />
+ reference="White_25" />
<color
name="ButtonLabelSelectedColor"
reference="White" />
<color
name="ButtonLabelSelectedDisabledColor"
- reference="White_50" />
+ reference="White_25" />
<color
name="ButtonSelectedBgColor"
reference="Unused?" />
@@ -307,7 +307,7 @@
reference="White"/>
<color
name="GroupNotifyDimmedTextColor"
- reference="DkGray"/>
+ reference="DkGray"/>
<color
name="GroupOverTierColor"
value="0.43 0.06 0.06 1" />
@@ -355,7 +355,7 @@
reference="Unused?" />
<color
name="IconDisabledColor"
- reference="White_50" />
+ reference="White_25" />
<color
name="IconEnabledColor"
reference="White" />
@@ -370,13 +370,13 @@
reference="Black" />
<color
name="LabelDisabledColor"
- reference="White_50" />
+ reference="White_25" />
<color
name="LabelSelectedColor"
reference="White" />
<color
name="LabelSelectedDisabledColor"
- reference="White_50" />
+ reference="White_25" />
<color
name="LabelTextColor"
reference="LtGray" />
@@ -558,7 +558,7 @@
name="ScrollBgReadOnlyColor"
reference="Transparent" />
<color
- name="ScrollBgWriteableColor"
+ name="ScrollBgWriteableColor"
reference="White_05" />
<color
name="ScrollDisabledColor"
@@ -592,7 +592,7 @@
reference="Unused?" />
<color
name="SliderDisabledThumbColor"
- reference="White_50" />
+ reference="White_25" />
<color
name="SliderThumbCenterColor"
reference="White" />
@@ -670,5 +670,5 @@
<color
name="SysWellItemSelected"
value="0.3 0.3 0.3 1.0" />
-
+
</colors>
diff --git a/indra/newview/skins/default/xui/en/floater_test_button.xml b/indra/newview/skins/default/xui/en/floater_test_button.xml
index 0681eedbabba253d8c1ee0aee9169b78b867f463..81247a387c07bf905fdb6ed39805053fe6ebea4e 100644
--- a/indra/newview/skins/default/xui/en/floater_test_button.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_button.xml
@@ -6,7 +6,7 @@
name="floater_test_button"
width="500">
<button
- height="20"
+ height="23"
label="Generic Button"
layout="topleft"
left="10"
@@ -15,27 +15,27 @@
width="150" />
<button
bottom_delta="30"
- height="20"
+ height="23"
label="Bottom delta"
layout="topleft"
name="bottom_delta_button" />
<button
bottom_delta="30"
font="SansSerifSmall"
- height="20"
+ height="23"
label="SansSerifSmall"
layout="topleft"
name="sans_serif_small_button" />
<button
auto_resize="true"
bottom_delta="30"
- height="20"
+ height="23"
label="Auto Resize"
layout="topleft"
name="auto_resize_button" />
<button
bottom_delta="30"
- height="20"
+ height="23"
is_toggle="true"
label="Click Change Label"
label_selected="New Label"
@@ -43,69 +43,69 @@
name="label_selected_button" />
<button
bottom_delta="30"
- height="20"
+ height="23"
label="No Label Shadow"
label_shadow="false"
layout="topleft"
name="label_shadow_button" />
<button
bottom_delta="30"
- height="20"
- label="Red Label"
- label_color="red"
+ height="23"
+ label="EmphasisColor Label"
+ label_color="EmphasisColor"
layout="topleft"
name="label_color_button" />
<button
bottom_delta="30"
- height="20"
+ height="23"
is_toggle="true"
- label="Red Label Selected"
- label_color_selected="red"
- label_selected="Red Label Selected"
+ label="Toggle"
+ label_color_selected="EmphasisColor"
+ label_selected="Toggle on"
layout="topleft"
name="label_color_selected_button" />
<button
bottom_delta="30"
enabled="false"
- height="20"
- label="Red Label Disabled"
- label_color_disabled="red"
- label_selected="Red Label Selected"
+ height="23"
+ label="Disabled"
+ label_color_disabled="EmphasisColor"
+ label_selected="Selected"
layout="topleft"
name="label_color_disabled_button" />
<button
bottom_delta="30"
- height="20"
- highlight_color="red"
- label="Red Highlight"
+ height="23"
+ highlight_color="EmphasisColor"
+ label="Highlight"
layout="topleft"
name="highlight_color_button" />
<button
bottom_delta="30"
- height="20"
+ height="23"
hover_glow_amount="0"
label="No Hover Glow"
layout="topleft"
name="hover_glow_amount_button" />
<button
- height="30"
- image_selected="object_cube_active.tga"
- image_unselected="object_cube.tga"
+ height="16"
+ image_selected="Move_Run_Off"
+ image_unselected="Move_Run_Off"
layout="topleft"
left="200"
name="image_button"
picture_style="true"
top="20"
- width="30" />
+ width="16" />
<button
- height="30"
- image_color="red"
- image_selected="object_cube_active.tga"
- image_unselected="object_cube.tga"
+ height="16"
+ image_color="EmphasisColor"
+ image_selected="Move_Run_Off"
+ image_unselected="Move_Run_Off"
layout="topleft"
left_delta="0"
name="image_color_button"
picture_style="true"
top_pad="10"
- width="30" />
+ width="16" />
</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
index 021474d7abe71bcd1fdecff4f04daca7105222c3..bedbc9d563f11b740ee3fef90e56a2ef2c2a6a23 100644
--- a/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_checkbox.xml
@@ -7,16 +7,16 @@
width="400">
<check_box
control_name="ShowStartLocation"
- height="16"
+ height="15"
initial_value="true"
- label="Show Start Location on Login Screen"
+ label="Oh look it's a checkbox!"
layout="topleft"
left="10"
name="show_location_checkbox"
top="28"
width="256" />
<check_box
- height="16"
+ height="15"
label="Minimal Checkbox"
layout="topleft"
left_delta="0"
@@ -25,7 +25,7 @@
width="150" />
<check_box
enabled="false"
- height="16"
+ height="15"
label="Disabled Checkbox"
layout="topleft"
left_delta="0"
@@ -33,26 +33,26 @@
top_pad="14"
width="150" />
<check_box
- height="16"
- label="Text Enabled Red"
+ height="15"
+ label="Text Enabled Color"
layout="topleft"
left_delta="0"
name="text_enabled_color_checkbox"
- text_enabled_color="red"
+ text_enabled_color="EmphasisColor"
top_pad="14"
width="150" />
<check_box
enabled="false"
- height="16"
- label="Text Disabled Red"
+ height="15"
+ label="Text Disabled Color"
layout="topleft"
left_delta="0"
name="text_disabled_color_checkbox"
- text_disabled_color="red"
+ text_disabled_color="EmphasisColor_35"
top_pad="14"
width="150" />
<check_box
- height="16"
+ height="15"
initial_value="true"
label="Initial Value Checked"
layout="topleft"
@@ -62,7 +62,7 @@
width="150" />
<check_box
font="Monospace"
- height="16"
+ height="15"
label="Font Monospace"
layout="topleft"
left_delta="0"
diff --git a/indra/newview/skins/default/xui/en/floater_test_spinner.xml b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
index da88d825e400e3d6e16e897c29c4599bbdc6685b..752ed81f65cd4ae997e03bf3b33e96a421cd3366 100644
--- a/indra/newview/skins/default/xui/en/floater_test_spinner.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_spinner.xml
@@ -6,17 +6,18 @@
name="floater_test_spinner"
width="450">
<spinner
- height="20"
+ height="32"
label="Generic Spinner"
layout="topleft"
left="10"
+ label_width="100"
name="generic_spinner"
top="40"
width="350" />
<spinner
height="20"
label="Callback Spinner"
- label_width="80"
+ label_width="100"
layout="topleft"
left_delta="0"
name="callback_spinner"
diff --git a/indra/newview/skins/default/xui/en/widgets/check_box.xml b/indra/newview/skins/default/xui/en/widgets/check_box.xml
index bbb5e9b56a4bd717b229113816f566e133ef8798..726ae803fe28c5364c6f49325ef1772bc237c35c 100644
--- a/indra/newview/skins/default/xui/en/widgets/check_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/check_box.xml
@@ -15,5 +15,5 @@
image_disabled="Checkbox_Off_Disabled"
image_disabled_selected="Checkbox_On_Disabled"
image_pressed="Checkbox_Press"
- image_pressed_selected="Checkbox_On_Press"/>
+ image_pressed_selected="Checkbox_On_Press" />
</check_box>