diff options
author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
---|---|---|
committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-28 10:43:02 -0400 |
commit | 3d2378f1020060a84ab0b9ae23507077b7a0e7c1 (patch) | |
tree | 448bc57cf16514ef602602feff45ec4583d18608 /indra/newview/skins/default/xui/en/widgets | |
parent | f094d4f7529c27233f5ca228bda21deb9b864f1a (diff) | |
parent | ebb55355ebbe6ec6760d8683e461903957ed24e5 (diff) |
merge from viewer-pre-release
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/badge.xml | 3 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/badge.xml b/indra/newview/skins/default/xui/en/widgets/badge.xml index f77c4b7178..2d4c02b092 100644 --- a/indra/newview/skins/default/xui/en/widgets/badge.xml +++ b/indra/newview/skins/default/xui/en/widgets/badge.xml @@ -7,11 +7,14 @@ image="Badge_Background" image_color="BadgeImageColor" label_color="BadgeLabelColor" + label_offset_horiz="0" + label_offset_vert="0" location="top_left" location_percent_hcenter="85" location_percent_vcenter="85" padding_horiz="7" padding_vert="4" requests_front="true" + mouse_opaque="false" > </badge> diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml index 2c987b158d..95f5cf2ecd 100644 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml @@ -6,5 +6,14 @@ item_top_pad="4" selection_image="Rounded_Square" > - <new_badge label="New" location="right" location_percent_hcenter="70" /> + <new_badge + label="New" + label_offset_horiz="-1" + location="right" + padding_horiz="4" + padding_vert="1" + location_percent_hcenter="70" + border_image="" + image="Badge_Background_New" + /> </inbox_folder_view_folder> |