chore: fix conflict typos.

This commit is contained in:
Zhang Dian
2026-02-06 21:50:08 +08:00
parent e10e83d282
commit ddad2a80d5
2 changed files with 2 additions and 4 deletions

View File

@@ -17,8 +17,6 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>irihi.png</PackageIcon>
<PackageProjectUrl>https://github.com/irihitech/Semi.Avalonia</PackageProjectUrl>
<AvaloniaVersion>12.0.999-cibuild0058575-alpha</AvaloniaVersion>
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>

View File

@@ -19,8 +19,8 @@
<Thickness x:Key="SemiBorderThickness">0</Thickness> <!-- 描边宽度 - 零 -->
<Thickness x:Key="SemiBorderThicknessControl">1</Thickness> <!-- 描边宽度 - 默认状态 -->
<Thickness x:Key="SemiBorderThicknessControlFocus">1</Thickness> <!-- 描边宽度 - focus 状态 -->
<x:Double x:Key="SemiBorderRadiusSpacingExtraSmall">3</x:Double> <!-- 半径 - 小 -->
<x:Double x:Key="SemiBorderRadiusSpacingSmall">3</x:Double> <!-- 半径 - 小 -->
<x:Double x:Key="SemiBorderRadiusSpacingExtraSmall">3</x:Double> <!-- 半径 - 小 -->
<x:Double x:Key="SemiBorderRadiusSpacingSmall">3</x:Double> <!-- 半径 - 小 -->
<x:Double x:Key="SemiBorderRadiusSpacingMedium">6</x:Double> <!-- 半径 - 中 -->
<x:Double x:Key="SemiBorderRadiusSpacingLarge">12</x:Double> <!-- 半径 - 大 -->
<x:Double x:Key="SemiBorderRadiusSpacingFull">9999</x:Double> <!-- 半径 - 全圆 -->