summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/skins/default/xui/en/floater_test_widgets.xml5
-rw-r--r--indra/newview/skins/default/xui/en/widgets/button.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/combo_box.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/flyout_button.xml2
4 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_test_widgets.xml b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
index 447bd7f599..80cb2723a0 100644
--- a/indra/newview/skins/default/xui/en/floater_test_widgets.xml
+++ b/indra/newview/skins/default/xui/en/floater_test_widgets.xml
@@ -88,7 +88,6 @@
<!-- First column -->
<button
- height="20"
follows="top|left"
label="Button"
layout="topleft"
@@ -100,7 +99,6 @@
<!-- "flyout_button" is a button that can spawn a menu -->
<flyout_button
follows="top|left"
- height="20"
label="Flyout"
layout="topleft"
left_delta="0"
@@ -136,7 +134,6 @@
<combo_box
bottom_delta="35"
follows="top|left"
- height="16"
width="150"
label="Combobox"
layout="topleft"
@@ -343,12 +340,10 @@ line to actually fit
<tab_container
follows="all"
height="400"
- halign="center"
layout="topleft"
left="525"
name="group_tab_container"
tab_position="top"
- tab_height="20"
tool_tip="tab container"
top="80"
width="300">
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 1b34a731a5..c4f0fe5208 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -22,5 +22,6 @@
hover_glow_amount="0.15"
halign="center"
pad_bottom="3"
+ height="23"
scale_image="true">
</button>
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 1f7499646f..d1f68a9ef9 100644
--- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml
+++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml
@@ -2,6 +2,7 @@
<combo_box font="SansSerifSmall"
list_position="below"
max_chars="20"
+ height="23"
follows="right|top">
<combo_box.combo_button name="Combobox Button"
hover_glow_amount="0.15"
diff --git a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
index a5043c5c14..83df10e417 100644
--- a/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/flyout_button.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<flyout_button list_position="below">
+<flyout_button list_position="below" height="23">
<action_button scale_image="true"
image_selected="SegmentedBtn_Left_Selected"
image_unselected="SegmentedBtn_Left_Off"