From de5dfd9de33731f69df94d3273a293b55cdb0b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20S=CC=8Colte=CC=81s?=
 <wieslaw.soltes@gmail.com>
Date: Tue, 7 Nov 2023 23:21:14 +0100
Subject: [PATCH] Move

---
 src/Core2D/App.axaml           | 3 ---
 src/Core2D/Styles/Common.axaml | 6 ++++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Core2D/App.axaml b/src/Core2D/App.axaml
index cdcf711b9..875345a29 100644
--- 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
index b5e7dc994..e9f549b34 100644
--- 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" />