zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: dotnet7->dotnet8, restore font weight.

Browse Source
This commit is contained in:
Zhang Dian 2024-07-01 12:42:14 +08:00
parent 694dd863fa
commit 942229acdc
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/Semi.Avalonia.Demo.Android/Semi.Avalonia.Demo.Android.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0-android</TargetFramework>
<TargetFramework>net8.0-android</TargetFramework>
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
<ApplicationId>com.irihitech.Semi.Avalonia</ApplicationId>
<ApplicationVersion>1</ApplicationVersion>

2
demo/Semi.Avalonia.Demo.Desktop/Semi.Avalonia.Demo.Desktop.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<!-- Uncomment below to enable Native AOT compilation-->

6
src/Semi.Avalonia/Themes/Shared/Button.axaml
View File

@ -1,11 +1,11 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:Double x:Key="ButtonDefaultFontSize">14</x:Double>
<FontWeight x:Key="ButtonDefaultFontWeight">Normal</FontWeight>
<FontWeight x:Key="ButtonDefaultFontWeight">600</FontWeight>
<Thickness x:Key="ButtonDefaultPadding">12 6</Thickness>
<Thickness x:Key="ButtonLargePadding">16 10</Thickness>
<Thickness x:Key="ButtonSmallPadding">6 2</Thickness>
<x:Double x:Key="ButtonDefaultHeight">32</x:Double>
<x:Double x:Key="ButtonSmallHeight">24</x:Double>
<x:Double x:Key="ButtonLargeHeight">40</x:Double>
@ -13,6 +13,6 @@
<Thickness x:Key="ButtonBorderThickness">1</Thickness>
<CornerRadius x:Key="ButtonCornerRadius">3</CornerRadius>
<StreamGeometry x:Key="IconButtonClearData">M12 23C18.0751 23 23 18.0751 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 18.0751 5.92487 23 12 23ZM17.0352 16.8626C16.4597 17.4585 15.5101 17.4751 14.9142 16.8996L12.0368 14.121L9.25822 16.9984C8.68274 17.5943 7.73314 17.6109 7.13722 17.0354C6.5413 16.4599 6.52472 15.5103 7.1002 14.9144L9.87883 12.037L7.00147 9.2584C6.40555 8.68293 6.38897 7.73332 6.96445 7.1374C7.53992 6.54148 8.48953 6.52491 9.08545 7.10038L11.9628 9.87901L14.7414 7.00165C15.3169 6.40573 16.2665 6.38916 16.8624 6.96463C17.4584 7.54011 17.4749 8.48971 16.8995 9.08563L14.1208 11.963L16.9982 14.7416C17.5941 15.3171 17.6107 16.2667 17.0352 16.8626Z</StreamGeometry>
</ResourceDictionary>

4
src/Semi.Avalonia/Themes/Shared/ToggleButton.axaml
View File

@ -1,7 +1,7 @@
<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:Double x:Key="ToggleButtonDefaultFontSize">14</x:Double>
<FontWeight x:Key="ToggleButtonDefaultFontWeight">Normal</FontWeight>
<FontWeight x:Key="ToggleButtonDefaultFontWeight">600</FontWeight>
<Thickness x:Key="ToggleButtonBorderThickness">1</Thickness>
<CornerRadius x:Key="ToggleButtonCornerRadius">3</CornerRadius>
</ResourceDictionary>