diff options
author | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
commit | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (patch) | |
tree | 0e261edeab3e2e3f53a1f3ab825aa76906fff152 /indra/newview/skins/default/xui/en/widgets | |
parent | f5ba6df4c2dc5a5e0842ed028dd4de01406dca3b (diff) |
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
4 files changed, 19 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index 45b1e1eb9f..a042a61a26 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -22,7 +22,7 @@ image_selected="DropDown_Selected" image_disabled="DropDown_Disabled" image_disabled_selected="DropDown_Disabled_Selected" /> - <combo_box.combo_list bg_writeable_color="white" /> + <combo_box.combo_list bg_writeable_color="MenuDefaultBgColor" /> <combo_box.combo_editor name="Combo Text Entry" select_on_focus="true" font="SansSerifSmall" /> diff --git a/indra/newview/skins/default/xui/en/widgets/line_editor.xml b/indra/newview/skins/default/xui/en/widgets/line_editor.xml index 3ab9379705..168609d5d7 100644 --- a/indra/newview/skins/default/xui/en/widgets/line_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/line_editor.xml @@ -6,7 +6,7 @@ ignore_tab="true" cursor_color="TextCursorColor" text_color="TextFgColor" - text_readonly_color="TextFgReadOnlyColor" + text_readonly_color="Green" text_tentative_color="TextFgTentativeColor" bg_readonly_color="TextBgReadOnlyColor" bg_writeable_color="TextBgWriteableColor" diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 07980a9d09..efb9a89c6a 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -7,8 +7,9 @@ <location_input font="SansSerifSmall" - add_landmark_image_enabled="icon_event_adult.tga" - add_landmark_image_disabled="icon_event.tga" + add_landmark_image_enabled="Favorite_Star_Active" + add_landmark_image_disabled="Favorite_Star_Off" + hover_glow_amount="0.15" add_landmark_width="20" add_landmark_height="20" add_landmark_hpad="2" @@ -41,7 +42,7 @@ label="" pad_right="0" tool_tip="My Location History"/> - <combo_list bg_writeable_color="white"/> + <combo_list bg_writeable_color="MenuDefaultBgColor"/> <combo_editor name="Combo Text Entry" text_pad_left="20" select_on_focus="true" diff --git a/indra/newview/skins/default/xui/en/widgets/spinner.xml b/indra/newview/skins/default/xui/en/widgets/spinner.xml index 29bf1e8052..7d1a5118cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/spinner.xml +++ b/indra/newview/skins/default/xui/en/widgets/spinner.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <spinner text_enabled_color="LabelTextColor" text_disabled_color="LabelDisabledColor" - decimal_digits="3" - label_width="40"/>
\ No newline at end of file + decimal_digits="3" + label_width="40" > + <spinner.up_button name="SpinCtrl Up" + image_unselected="Stepper_Up_Off" + image_selected="Stepper_Up_Press" + tab_stop="false" + follows="left|bottom" /> + <spinner.down_button name="SpinCtrl Down" + image_unselected="Stepper_Down_Off" + image_selected="Stepper_Down_Press" + tab_stop="false" + follows="left|bottom" /> +</spinner>
\ No newline at end of file |