Steeltoe's XUI changes

9 files changed, 48 insertions, 38 deletions

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index e85ac6c08c..d6f50332d0 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -37,8 +37,8 @@
   <font
       name="SansSerifBold"
       comment="Name of bold sans-serif font">
-    <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
-    <file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
+      <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-ExtraBold.ttf</file>
+      <file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
     <os name="Windows">
       <file>arialbd.ttf</file>
       </os>
@@ -64,7 +64,7 @@
       name="SansSerif"
       comment="Name of bold sans-serif font"
       font_style="BOLD">
-    <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
+    <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-Bold.ttf</file>
     <file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
   </font>
 
@@ -135,7 +135,7 @@
       name="Helvetica"
       comment="Name of Helvetica font (bold)"
       font_style="BOLD">
-    <file font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
+    <file font_hinting="default" flags="bold">Inter_18pt-ExtraBold.ttf</file>
     <file size_delta="-0.5">DejaVuSans-Bold.ttf</file>
     <os name="Windows">
       <file>arialbd.ttf</file>
@@ -181,26 +181,30 @@
   </font>
 
   <font_size name="Monospace"
-	     comment="Size for monospaced font (points, or 1/72 of an inch)"
-	     size="8.0"
-	     />
+         comment="Size for monospaced font (points, or 1/72 of an inch)"
+         size="8.0"
+         />
   <font_size name="Huge"
-	     comment="Size of huge font (points, or 1/72 of an inch)"
-	     size="16.0"
-	     />
+         comment="Size of huge font (points, or 1/72 of an inch)"
+         size="16.0"
+         />
   <font_size name="Large"
-	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="11.0"
-	     />
+         comment="Size of large font (points, or 1/72 of an inch)"
+         size="11.0"
+         />
   <font_size name="Medium"
-	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="9"
-	     />
+         comment="Size of medium font (points, or 1/72 of an inch)"
+         size="10"
+         />
   <font_size name="Small"
-	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="8"
-	     />
-  <font_size name="SmallLSL"
+         comment="Size of small font (points, or 1/72 of an inch)"
+         size="9"
+         />
+   <font_size name="Smaller"
+         comment="Size of small font (points, or 1/72 of an inch)"
+         size="8"
+         />
+<font_size name="SmallLSL"
          comment="Size of small font for LSL editor (points, or 1/72 of an inch)"
          size="7"
          />
diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
index c1d743c3da..2bd25b43bd 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml
@@ -15,7 +15,7 @@
      <string name="height_value_label_color" translate="false">White</string>
      <text
          follows="top|left|right"
-         font="SansSerifSmallBold"
+         font="SansSerifSmall"
          halign="right"
          height="12"
          layout="topleft"
@@ -36,7 +36,7 @@
          layout="topleft"
 		 left="10"
          name="accordion_panel"
-		 top_pad="0"
+		 top_pad="5"
          width="313">
 	 <accordion
         layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml
index 27b74a46ce..21c4444c75 100644
--- a/indra/newview/skins/default/xui/en/panel_login.xml
+++ b/indra/newview/skins/default/xui/en/panel_login.xml
@@ -108,9 +108,10 @@
     image_unselected="PushButton_Login"
     image_pressed="PushButton_Login_Pressed"
     image_hover_unselected="PushButton_Login_Over"
-    label="Log In"
+    label="Log in"
     label_color="White"
     font="SansSerifMedium"
+	font.style="BOLD"
     name="connect_btn"
     enabled="true"    
     width="120"
diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml
index 16111758cc..b290706271 100644
--- a/indra/newview/skins/default/xui/en/panel_status_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml
@@ -91,7 +91,7 @@
      left="0" 
      name="balance"
      tool_tip="L$ [AMT]&#10;Click to refresh your L$ balance.&#10;Double-click to display or hide your L$ balance."
-     v_pad="4"
+     v_pad="2"
      top="0"
      wrap="false" 
      value="L$??" 
@@ -140,7 +140,7 @@
      follows="right|top"
      halign="right"
      height="16"
-     top="5"
+     top="3"
      layout="topleft"
      left_pad="0"
      name="TimeText"
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 6225464492..bc0350c446 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -29,7 +29,7 @@ width="333">
    background_visible="true"
    bg_opaque_color="DkGray2"
    left="10"
-   top="5"
+   top="0"
    follows="left|top|right"
    layout="topleft"
    width="307"
@@ -58,7 +58,7 @@ width="333">
       follows="top|left|right"
       layout="topleft"
       left="5"
-      top="3"
+      top="0"
       mouse_opaque="false"
       name="currentlook_status" >
       (Status)
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
index 53d1e18a84..6509c8c1f3 100644
--- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -11,4 +11,5 @@
     header_image_focused="Accordion_Selected"
     header_text_color="AccordionHeaderTextColor"
     font="SansSerif"
+    font.size="Small"
     />
diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
index eed50ed5ed..bcc7772681 100644
--- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml
@@ -3,18 +3,21 @@
   folder_arrow_image="Folder_Arrow"
   favorite_image="Inv_Favorite_Star_Full"
   favorite_content_image="Inv_Favorite_Star_Content"
-  folder_indentation="8"
-  item_height="20" 
+  folder_indentation="10"
+  item_height="21" 
   item_top_pad="4"
-  selection_image="Square_Selection"
+  selection_image="Rounded_Square"
   mouse_opaque="true"
   follows="left|top|right"
   left_pad="5"
-  icon_pad="2"
+  icon_pad="4"
   icon_width="16"
-  text_pad="1"
+  text_pad="3"
   text_pad_right="4"
-  text_pad_top="1"
+  text_pad_top="0"
   arrow_size="12"
-  arrow_pad_top="1"
   max_folder_item_overlap="2"/>
+
+<!-- Potential properties not included above:
+  arrow_pad_top
+-->
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
index e3b9030280..63613d34cb 100644
--- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml
+++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml
@@ -6,10 +6,11 @@ label_pad_left - padding to the left of tab button labels
 <tab_container name="tab_container" 
                mouse_opaque="false"
                tab_min_width="60"
-               tab_max_width="150"
+               tab_max_width="160"
                use_custom_icon_ctrl="false"
                halign="center"
-               font="SansSerifSmall" 
+               font="SansSerif"
+               font.size="Small"
                tab_height="21"
                label_pad_bottom="1"
                label_pad_left="4">
diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
index 0f927f8bb3..64be14a69c 100644
--- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
+++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml
@@ -29,14 +29,14 @@
     width="16" />
   <item_name
     follows="left|right"
-    height="20"
+    height="21"
     layout="topleft"
     left="21"
     parse_urls="false"
     use_ellipses="true"
     name="item_name"
     text_color="white"
-    top="4"
+    top="1"
     value="..."
     width="359" />
     <add_btn