Move

wieslawsoltes · Nov 7, 2023 · de5dfd9 · de5dfd9
1 parent deb349b
commit de5dfd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Core2D/App.axaml b/src/Core2D/App.axaml
@@ -11,9 +11,6 @@
         <MergeResourceInclude Source="avares://Core2D/Themes/Themes.axaml" />
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
-    <FontFamily x:Key="UiFontFamily">avares://Avalonia.Fonts.Inter/Assets#Inter</FontFamily>
-    <FontFamily x:Key="CodeFontFamily">avares://Core2D/Assets/Fonts#Roboto Mono</FontFamily>
-    <StaticResource x:Key="ContentControlThemeFontFamily" ResourceKey="UiFontFamily" />
   </Application.Resources>
   <Application.Styles>
     <FluentTheme DensityStyle="Compact" />

diff --git a/src/Core2D/Styles/Common.axaml b/src/Core2D/Styles/Common.axaml
@@ -1,6 +1,12 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+  <Styles.Resources>
+    <FontFamily x:Key="UiFontFamily">avares://Avalonia.Fonts.Inter/Assets#Inter</FontFamily>
+    <FontFamily x:Key="CodeFontFamily">avares://Core2D/Assets/Fonts#Roboto Mono</FontFamily>
+    <StaticResource x:Key="ContentControlThemeFontFamily" ResourceKey="UiFontFamily" />
+  </Styles.Resources>
+
   <Style Selector="Label">
     <Setter Property="Margin" Value="0,0,0,0" />
     <Setter Property="Padding" Value="0,6,0,6" />