summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <andreylproductengine@lindenlab.com>2015-12-15 01:19:38 +0200
committerAndrey Lihatskiy <andreylproductengine@lindenlab.com>2015-12-15 01:19:38 +0200
commit88e0605ba23b22ff680e7c70364724cf8b4ec6e0 (patch)
tree8adb65b0dfeab72a698535bc6a74823fddedc831
parent18f4ad27b6b18f3ea32f610136858b64a816cc85 (diff)
parentfd8762f9f41c2da71d05e69166cbbed4cfb25fe9 (diff)
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #14)
MAINT-5961 FIXED Incorrect position of "Delete all" button within "Notifications" floater
-rw-r--r--indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
index c17d2a1f37..b5ae9db7e9 100644
--- a/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
+++ b/indra/newview/skins/default/xui/en/floater_notifications_tabbed.xml
@@ -136,16 +136,16 @@
</tab_container>
<layout_stack width="336" height="26" enabled="true" orientation="horizontal" follows="left|right" name="ButtonsStack">
- <layout_panel width="336" height="30" enabled="true" name="CondenseAllButtonPanel">
+ <layout_panel width="93" height="30" enabled="true" name="CondenseAllButtonPanel">
<button width="93" height="21" left="2" label="Collapse all" name="collapse_all_button">
</button>
</layout_panel>
- <layout_panel width="336" height="30" enabled="true" name="GapLayoutPanel">
+ <layout_panel width="93" height="30" enabled="true" name="GapLayoutPanel">
<panel width="90" height="21" left="2" label="Gap Panel" border="false" name="GapPanel">
</panel>
</layout_panel>
- <layout_panel width="336" height="30" enabled="true" name="DeleteAllButtonPanel">
- <button width="93" height="21" left="2" label="Delete all" name="delete_all_button">
+ <layout_panel width="100" height="30" enabled="true" name="DeleteAllButtonPanel">
+ <button width="93" height="21" left="0" label="Delete all" follows="right" name="delete_all_button">
</button>
</layout_panel>
</layout_stack>