From 06d9e35adda41ddbf1a4f3cce02a2422e6711822 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 2 Jan 2025 17:44:28 +0800
Subject: [PATCH] misc: delete Base.axaml file.

---
 src/Semi.Avalonia/Index.axaml                   |  1 -
 src/Semi.Avalonia/SemiTheme.axaml               |  1 -
 src/Semi.Avalonia/Themes/Base.axaml             | 13 -------------
 src/Semi.Avalonia/Themes/Dark/Window.axaml      |  1 +
 src/Semi.Avalonia/Themes/Light/Window.axaml     |  1 +
 src/Semi.Avalonia/Themes/Shared/TextBlock.axaml |  1 +
 src/Semi.Avalonia/Themes/Shared/Window.axaml    |  2 ++
 src/Semi.Avalonia/Tokens/Variables.axaml        |  5 +++++
 8 files changed, 10 insertions(+), 15 deletions(-)
 delete mode 100644 src/Semi.Avalonia/Themes/Base.axaml

diff --git a/src/Semi.Avalonia/Index.axaml b/src/Semi.Avalonia/Index.axaml
index c76abf6..334aa54 100644
--- a/src/Semi.Avalonia/Index.axaml
+++ b/src/Semi.Avalonia/Index.axaml
@@ -13,7 +13,6 @@
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
diff --git a/src/Semi.Avalonia/SemiTheme.axaml b/src/Semi.Avalonia/SemiTheme.axaml
index 20cb78b..eea19b2 100644
--- a/src/Semi.Avalonia/SemiTheme.axaml
+++ b/src/Semi.Avalonia/SemiTheme.axaml
@@ -14,7 +14,6 @@
             </ResourceDictionary.ThemeDictionaries>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="avares://Semi.Avalonia/Controls/_index.axaml" />
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Themes/Shared/_index.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Tokens/Variables.axaml" />
                 <ResourceInclude Source="avares://Semi.Avalonia/Locale/zh-cn.axaml" />
diff --git a/src/Semi.Avalonia/Themes/Base.axaml b/src/Semi.Avalonia/Themes/Base.axaml
deleted file mode 100644
index 2489219..0000000
--- a/src/Semi.Avalonia/Themes/Base.axaml
+++ /dev/null
@@ -1,13 +0,0 @@
-<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Default">
-            <SolidColorBrush x:Key="DefaultForeground" Color="#1C1F23" />
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Dark">
-            <SolidColorBrush x:Key="DefaultForeground" Color="#F9F9F9" />
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-    <x:Double x:Key="DefaultFontSize">14</x:Double>
-    <FontFamily x:Key="DefaultFontFamily">Inter, -apple-system,BlinkMacSystemFont,PingFang SC, Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,Helvetica,Arial,sans-serif</FontFamily>
-    <FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily>
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Dark/Window.axaml b/src/Semi.Avalonia/Themes/Dark/Window.axaml
index 1f95612..b9d1483 100644
--- a/src/Semi.Avalonia/Themes/Dark/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/Window.axaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
     <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/Window.axaml b/src/Semi.Avalonia/Themes/Light/Window.axaml
index 1f95612..b9d1483 100644
--- a/src/Semi.Avalonia/Themes/Light/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Window.axaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="WindowDefaultBackground" ResourceKey="SemiColorBackground0" />
     <StaticResource x:Key="WindowDefaultForeground" ResourceKey="SemiColorText0" />
+    <StaticResource x:Key="DefaultForeground" ResourceKey="SemiColorText0" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
index 3aa75c2..6fdefa0 100644
--- a/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/TextBlock.axaml
@@ -10,4 +10,5 @@
     <StaticResource x:Key="TextBlockFontWeight" ResourceKey="SemiFontWeightRegular" />
     <StaticResource x:Key="TextBlockTitleFontWeight" ResourceKey="SemiFontWeightBold" />
     <CornerRadius x:Key="TextBlockCodeCornerRadius">2</CornerRadius>
+    <FontFamily x:Key="CodeFontFamily">Cascadia Code, Consolas, Inconsolata, monospace</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Shared/Window.axaml b/src/Semi.Avalonia/Themes/Shared/Window.axaml
index 9b91be8..6c18d0f 100644
--- a/src/Semi.Avalonia/Themes/Shared/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Window.axaml
@@ -1,2 +1,4 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="DefaultFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="DefaultFontFamily" ResourceKey="SemiFontFamilyRegular" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Tokens/Variables.axaml b/src/Semi.Avalonia/Tokens/Variables.axaml
index c155e99..f3de46d 100644
--- a/src/Semi.Avalonia/Tokens/Variables.axaml
+++ b/src/Semi.Avalonia/Tokens/Variables.axaml
@@ -61,4 +61,9 @@
     <FontWeight x:Key="SemiFontWeightLight">200</FontWeight> <!-- 字重 - 轻 -->
     <FontWeight x:Key="SemiFontWeightRegular">400</FontWeight> <!-- 字重 - 常规 -->
     <FontWeight x:Key="SemiFontWeightBold">600</FontWeight> <!-- 字重 - 粗 -->
+    <FontFamily x:Key="SemiFontFamilyRegular">
+        Inter, -apple-system, BlinkMacSystemFont, PingFang SC,
+        Microsoft YaHei, Segoe UI, Hiragino Sans GB, Helvetica Neue,
+        Helvetica, Arial, sans-serif
+    </FontFamily>
 </ResourceDictionary>
\ No newline at end of file