diff options
author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
---|---|---|
committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:56:42 -0800 |
commit | 22193b15b82d1a6f0ce8846d122bf3ddcefbf13e (patch) | |
tree | c6c2b595b3e6c518bcf5450e56fb470fa5c07dba /indra/newview/skins/default/xui/en/widgets | |
parent | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (diff) | |
parent | 465a3356a2f32362837d5231a21b9151f45f890b (diff) |
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/button.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/inspector.xml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 74d8478551..1b34a731a5 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -7,10 +7,9 @@ image_selected="PushButton_Selected" image_disabled_selected="PushButton_Selected_Disabled" image_disabled="PushButton_Disabled" - image_left_pad="0" - image_right_pad="0" image_top_pad="0" image_bottom_pad="0" + imgoverlay_label_space="1" label_color="ButtonLabelColor" label_color_selected="ButtonLabelSelectedColor" label_color_disabled="ButtonLabelDisabledColor" diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml index 23f32253b6..428b2ce03b 100644 --- a/indra/newview/skins/default/xui/en/widgets/inspector.xml +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml @@ -2,7 +2,7 @@ <inspector name="inspector" bg_opaque_color="DkGray_66" background_visible="true" - bg_opaque_image="none" + bg_opaque_image="Inspector_Hover" background_opaque="true" bg_alpha_image="none" mouse_opaque="true" |