Merge branch 'project/fonts-update' into project/flat-ui-fonts-update

3 files changed, 109 insertions, 93 deletions

diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml
index 45ec1e27f1..de8e640455 100644
--- a/indra/newview/skins/default/xui/en/fonts.xml
+++ b/indra/newview/skins/default/xui/en/fonts.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <fonts>
 
-  <font name="default" comment="default font files (global fallbacks)">
-    <file>DejaVuSans.ttf</file>
+  <font
+      name="default"
+      comment="default font files (global fallbacks)">
+    <file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file>
     <file functor="is_emoji">TwemojiSVG.ttf</file>
     <os name="Windows">
       <file>meiryo.TTC</file>
@@ -31,9 +33,10 @@
     </os>
   </font>
 
-  <font name="SansSerifBold"
-	comment="Name of bold sans-serif font">
-    <file>DejaVuSans-Bold.ttf</file>
+  <font
+      name="SansSerifBold"
+      comment="Name of bold sans-serif font">
+    <file load_collection="true" font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
     <os name="Windows">
       <file>arialbd.ttf</file>
       </os>
@@ -42,8 +45,10 @@
       </os>
   </font>
 
-  <font name="SansSerif" comment="Name of san-serif font (Truetype file name)">
-    <file>DejaVuSans.ttf</file>
+  <font
+      name="SansSerif"
+      comment="Name of san-serif font (Truetype file name)">
+    <file load_collection="true" font_hinting="default">Inter_18pt-Regular.ttf</file>
     <os name="Windows">
       <file>arial.ttf</file>
       </os>
@@ -52,31 +57,35 @@
       </os>
   </font>
 
-  <font name="SansSerif"
-	comment="Name of bold sans-serif font"
-	font_style="BOLD">
-    <file>DejaVuSans-Bold.ttf</file>
+  <font
+      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>
   </font>
 
-  <font name="SansSerif"
-	comment="Name of italic sans-serif font"
-	font_style="ITALIC">
-    <file>DejaVuSans-Oblique.ttf</file>
+  <font
+      name="SansSerif"
+      comment="Name of italic sans-serif font"
+      font_style="ITALIC">
+    <file load_collection="true">Inter_18pt-Italic.ttf</file>
   </font>
 
-  <font name="SansSerif"
-	comment="Name of bold italic sans-serif font"
-	font_style="BOLD|ITALIC">
-    <file>DejaVuSans-BoldOblique.ttf</file>
+  <font
+      name="SansSerif"
+      comment="Name of bold italic sans-serif font"
+      font_style="BOLD|ITALIC">
+    <file load_collection="true">Inter_18pt-BoldItalic.ttf</file>
   </font>
 
   <font name="Emoji"
 	comment="Name of emoji font">
     <file>TwemojiSVG.ttf</file>
   </font>
-
-  <font name="Monospace"
-	comment="Name of monospace font">
+  
+  <font
+      name="Monospace"
+      comment="Name of monospace font">
     <file>DejaVuSansMono.ttf</file>
   </font>
 
@@ -103,9 +112,10 @@
     <file>DejaVuSans-BoldOblique.ttf</file>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font">
-    <file>DejaVuSans.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font">
+    <file font_hinting="default">Inter_18pt-Regular.ttf</file>
     <os name="Windows">
       <file>arial.ttf</file>
       </os>
@@ -114,10 +124,11 @@
       </os>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (bold)"
-	font_style="BOLD">
-    <file>DejaVuSans-Bold.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font (bold)"
+      font_style="BOLD">
+    <file font_hinting="default" flags="bold">Inter_18pt-SemiBold.ttf</file>
     <os name="Windows">
       <file>arialbd.ttf</file>
       </os>
@@ -126,10 +137,11 @@
       </os>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (italic)"
-	font_style="ITALIC">
-    <file>DejaVuSans-Oblique.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font (italic)"
+      font_style="ITALIC">
+    <file>Inter_18pt-Italic.ttf</file>
     <os name="Windows">
       <file>ariali.ttf</file>
       </os>
@@ -138,10 +150,11 @@
       </os>
   </font>
 
-  <font name="Helvetica"
-	comment="Name of Helvetica font (bold italic)"
-	font_style="BOLD|ITALIC">
-    <file>DejaVuSans-BoldOblique.ttf</file>
+  <font
+      name="Helvetica"
+      comment="Name of Helvetica font (bold italic)"
+      font_style="BOLD|ITALIC">
+    <file>Inter_18pt-BoldItalic.ttf</file>
     <os name="Windows">
       <file>arialbi.ttf</file>
       </os>
@@ -150,10 +163,11 @@
       </os>
   </font>
 
-  <font name="OverrideTest"
-	comment="Name of font to test overriding">
+  <font
+      name="OverrideTest"
+      comment="Name of font to test overriding">
     <file>times.ttf</file>
-    <file>DejaVuSans.ttf</file>
+    <file font_hinting="default">Inter_18pt-Regular.ttf</file>
   </font>
 
   <font_size name="Monospace"
@@ -166,15 +180,15 @@
 	     />
   <font_size name="Large"
 	     comment="Size of large font (points, or 1/72 of an inch)"
-	     size="10.6"
+	     size="11.0"
 	     />
   <font_size name="Medium"
 	     comment="Size of medium font (points, or 1/72 of an inch)"
-	     size="8.6"
+	     size="9"
 	     />
   <font_size name="Small"
 	     comment="Size of small font (points, or 1/72 of an inch)"
-	     size="7.6"
+	     size="8"
 	     />
   <font_size name="SmallLSL"
          comment="Size of small font for LSL editor (points, or 1/72 of an inch)"
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 3b20e3a908..eed50ed5ed 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
@@ -14,5 +14,7 @@
   icon_width="16"
   text_pad="1"
   text_pad_right="4"
+  text_pad_top="1"
   arrow_size="12"
+  arrow_pad_top="1"
   max_folder_item_overlap="2"/>
diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml
index 2085e916c8..874f530f17 100644
--- a/indra/newview/skins/default/xui/ja/fonts.xml
+++ b/indra/newview/skins/default/xui/ja/fonts.xml
@@ -2,11 +2,11 @@
 <fonts>
 	<font name="default" comment="default font files (global fallbacks)">
 		<file>
-			NotoSansCJKjp-Medium.otf
-		</file>
-		<file>
-			DejaVuSans.ttf
+			NotoSansCJKjp-SemiBold.otf
 		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 		<os name="Windows">
 			<file load_collection="true">
 				YuGothM.ttc
@@ -41,7 +41,7 @@
 		</os>
 		<os name="Mac">
 			<file>
-				YuGothic-Medium.otf
+				YuGothic-SemiBold.otf
 			</file>
 			<file>
 				ヒラギノ角ゴシック W3.ttc
@@ -82,9 +82,9 @@
 		<file>
 			NotoSansCJKjp-Bold.otf
 		</file>
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 		<os name="Windows">
 			<file load_collection="true">
 				YuGothB.ttc
@@ -106,9 +106,9 @@
 		<file>
 			NotoSansCJKjp-Bold.otf
 		</file>
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arial.ttf
@@ -121,19 +121,19 @@
 		</os>
 	</font>
 	<font name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD">
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 	</font>
 	<font name="SansSerif" comment="Name of italic sans-serif font" font_style="ITALIC">
-		<file>
-			DejaVuSans-Oblique.ttf
-		</file>
+        <file load_collection="true">
+            Inter_18pt-Italic.ttf
+        </file>
 	</font>
 	<font name="SansSerif" comment="Name of bold italic sans-serif font" font_style="BOLD|ITALIC">
-		<file>
-			DejaVuSans-BoldOblique.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBoldItalic.ttf
+        </file>
 	</font>
 	<font name="Monospace" comment="Name of monospace font">
 		<file>
@@ -144,29 +144,29 @@
 		</file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font">
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font (bold)" font_style="BOLD">
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="force_auto" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font (italic)" font_style="ITALIC">
-		<file>
-			DejaVuSans-Oblique.ttf
-		</file>
+        <file load_collection="true">
+            Inter_18pt-Italic.ttf
+        </file>
 	</font>
 	<font name="DejaVu" comment="Name of DejaVu font (bold italic)" font_style="BOLD|ITALIC">
-		<file>
-			DejaVuSans-BoldOblique.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBoldItalic.ttf
+        </file>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font">
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arial.ttf
@@ -179,9 +179,9 @@
 		</os>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD">
-		<file>
-			DejaVuSans-Bold.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBold.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arialbd.ttf
@@ -194,9 +194,9 @@
 		</os>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font (italic)" font_style="ITALIC">
-		<file>
-			DejaVuSans-Oblique.ttf
-		</file>
+        <file load_collection="true">
+            Inter_18pt-Italic.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				ariali.ttf
@@ -209,9 +209,9 @@
 		</os>
 	</font>
 	<font name="Helvetica" comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC">
-		<file>
-			DejaVuSans-BoldOblique.ttf
-		</file>
+        <file load_collection="true" font_hinting="default" flags="bold">
+            Inter_18pt-SemiBoldItalic.ttf
+        </file>
 		<os name="Windows">
 			<file>
 				arialbi.ttf
@@ -227,13 +227,13 @@
 		<file>
 			times.ttf
 		</file>
-		<file>
-			DejaVuSans.ttf
-		</file>
+        <file load_collection="true" font_hinting="default">
+            Inter_18pt-Regular.ttf
+        </file>
 	</font>
 	<font_size name="Monospace" 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"/>
-	<font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="10.6"/>
-	<font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="8.6"/>
-	<font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="7.6"/>
+	<font_size name="Large" comment="Size of large font (points, or 1/72 of an inch)" size="11"/>
+	<font_size name="Medium" comment="Size of medium font (points, or 1/72 of an inch)" size="9"/>
+	<font_size name="Small" comment="Size of small font (points, or 1/72 of an inch)" size="8"/>
 </fonts>