Merge branch 'master' into issues/4786

samples/ControlCatalog/App.xaml.cs

@@ -81,7 +81,7 @@ namespace ControlCatalog
 
         public override void Initialize()
         {
-            Styles.Insert(0, FluentDark);
+            Styles.Insert(0, FluentLight);
 
             AvaloniaXamlLoader.Load(this);
         }

samples/ControlCatalog/MainView.xaml

@@ -77,8 +77,8 @@
             <ComboBoxItem>Full Decorations</ComboBoxItem>
           </ComboBox>
           <ComboBox x:Name="Themes" SelectedIndex="0">
-            <ComboBoxItem>Fluent - Dark</ComboBoxItem>
             <ComboBoxItem>Fluent - Light</ComboBoxItem>
+            <ComboBoxItem>Fluent - Dark</ComboBoxItem>
             <ComboBoxItem>Simple - Light</ComboBoxItem>
             <ComboBoxItem>Simple - Dark</ComboBoxItem>
           </ComboBox>

samples/ControlCatalog/MainView.xaml.cs

@@ -38,10 +38,10 @@ namespace ControlCatalog
                 switch (themes.SelectedIndex)
                 {
                     case 0:
-                        Application.Current.Styles[0] = App.FluentDark;
+                        Application.Current.Styles[0] = App.FluentLight;
                         break;
                     case 1:
-                        Application.Current.Styles[0] = App.FluentLight;
+                        Application.Current.Styles[0] = App.FluentDark;
                         break;
                     case 2:
                         Application.Current.Styles[0] = App.DefaultLight;

src/Avalonia.Themes.Fluent/Accents/Base.xaml

@@ -12,7 +12,7 @@
     <Color x:Key="SystemColorHotlightColor">#FF0066CC</Color>
     <Color x:Key="SystemColorWindowColor">#FFFFFFFF</Color>
     <Color x:Key="SystemColorWindowTextColor">#FF000000</Color>
-    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Roboto</FontFamily>
+    <FontFamily x:Key="ContentControlThemeFontFamily">avares://Avalonia.Themes.Fluent/Assets#Inter</FontFamily>
     <sys:Double x:Key="ControlContentThemeFontSize">14</sys:Double>
 
     <SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />