zhusenlin/Semi.Avalonia
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/se/Semi.Avalonia synced 2026-03-03 00:00:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: remove White color resource in Light & Ghost classes.

Browse Source
This commit is contained in:
Zhang Dian
2025-04-12 19:07:49 +08:00
parent c9e549c3e8
commit 5843cbf430
3 changed files with 22 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Semi.Avalonia/Controls/Label.axaml
View File

@@ -266,11 +266,6 @@
<Setter Property="Background" Value="{DynamicResource LabelTagLightGreyBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightGreyForeground}" />
</Style>
<Style Selector="^.White">
<Setter Property="Background" Value="{DynamicResource LabelTagLightWhiteBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagLightWhiteForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagLightWhiteBorderBrush}" />
</Style>
</Style>
<Style Selector="^.Ghost">
<Setter Property="Background" Value="Transparent" />
@@ -340,11 +335,6 @@
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostGreyBorderBrush}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagGhostGreyForeground}" />
</Style>
<Style Selector="^.White">
<Setter Property="Background" Value="{DynamicResource LabelTagGhostWhiteBackground}" />
<Setter Property="Foreground" Value="{DynamicResource LabelTagGhostWhiteForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagGhostWhiteBorderBrush}" />
</Style>
</Style>
<Style Selector="^.Solid">
<Setter Property="BorderBrush" Value="Transparent" />
@@ -398,11 +388,12 @@
<Style Selector="^.Grey">
<Setter Property="Background" Value="{DynamicResource LabelTagSolidGreyBackground}" />
</Style>
<Style Selector="^.White">
<Setter Property="Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
</Style>
</Style>
<Style Selector="^.White">
<Setter Property="Foreground" Value="{DynamicResource LabelTagSolidWhiteForeground}" />
<Setter Property="BorderBrush" Value="{DynamicResource LabelTagSolidWhiteBorderBrush}" />
<Setter Property="Background" Value="{DynamicResource LabelTagSolidWhiteBackground}" />
</Style>
</ControlTheme>
</ResourceDictionary>

18
src/Semi.Avalonia/Themes/Dark/Label.axaml
View File

@@ -33,11 +33,6 @@
<StaticResource x:Key="LabelTagLightGreyForeground" ResourceKey="SemiGrey8" />
<SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="{StaticResource SemiGrey5Color}" />
<StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagLightWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<StaticResource x:Key="LabelTagGhostRedBorderBrush" ResourceKey="SemiRed4" />
<StaticResource x:Key="LabelTagGhostRedForeground" ResourceKey="SemiRed5" />
<StaticResource x:Key="LabelTagGhostPinkBorderBrush" ResourceKey="SemiPink4" />
@@ -71,11 +66,6 @@
<StaticResource x:Key="LabelTagGhostGreyBorderBrush" ResourceKey="SemiGrey4" />
<StaticResource x:Key="LabelTagGhostGreyForeground" ResourceKey="SemiGrey5" />
<StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagGhostWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<StaticResource x:Key="LabelTagSolidForeground" ResourceKey="SemiWhite" />
<StaticResource x:Key="LabelTagSolidRedBackground" ResourceKey="SemiRed5" />
<StaticResource x:Key="LabelTagSolidPinkBackground" ResourceKey="SemiPink5" />
@@ -97,4 +87,12 @@
<StaticResource x:Key="LabelTagSolidWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagSolidWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<!-- Obsolete -->
<StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
<StaticResource x:Key="LabelTagLightWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
<StaticResource x:Key="LabelTagLightWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
<StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
<StaticResource x:Key="LabelTagGhostWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
<StaticResource x:Key="LabelTagGhostWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
</ResourceDictionary>

18
src/Semi.Avalonia/Themes/Light/Label.axaml
View File

@@ -33,11 +33,6 @@
<StaticResource x:Key="LabelTagLightGreyForeground" ResourceKey="SemiGrey8" />
<SolidColorBrush x:Key="LabelTagLightGreyBackground" Opacity="0.15" Color="{StaticResource SemiGrey5Color}" />
<StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagLightWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagLightWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<StaticResource x:Key="LabelTagGhostRedBorderBrush" ResourceKey="SemiRed4" />
<StaticResource x:Key="LabelTagGhostRedForeground" ResourceKey="SemiRed5" />
<StaticResource x:Key="LabelTagGhostPinkBorderBrush" ResourceKey="SemiPink4" />
@@ -71,11 +66,6 @@
<StaticResource x:Key="LabelTagGhostGreyBorderBrush" ResourceKey="SemiGrey4" />
<StaticResource x:Key="LabelTagGhostGreyForeground" ResourceKey="SemiGrey5" />
<StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagGhostWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagGhostWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<StaticResource x:Key="LabelTagSolidForeground" ResourceKey="SemiWhite" />
<StaticResource x:Key="LabelTagSolidRedBackground" ResourceKey="SemiRed5" />
<StaticResource x:Key="LabelTagSolidPinkBackground" ResourceKey="SemiPink5" />
@@ -97,4 +87,12 @@
<StaticResource x:Key="LabelTagSolidWhiteForeground" ResourceKey="SemiColorText0" />
<StaticResource x:Key="LabelTagSolidWhiteBackground" ResourceKey="SemiColorBackground4" />
<SolidColorBrush x:Key="LabelTagSolidWhiteBorderBrush" Opacity="0.7" Color="{StaticResource SemiGrey2Color}" />
<!-- Obsolete -->
<StaticResource x:Key="LabelTagLightWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
<StaticResource x:Key="LabelTagLightWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
<StaticResource x:Key="LabelTagLightWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
<StaticResource x:Key="LabelTagGhostWhiteForeground" ResourceKey="LabelTagSolidWhiteForeground" />
<StaticResource x:Key="LabelTagGhostWhiteBackground" ResourceKey="LabelTagSolidWhiteBackground" />
<StaticResource x:Key="LabelTagGhostWhiteBorderBrush" ResourceKey="LabelTagSolidWhiteBorderBrush" />
</ResourceDictionary>