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

misc: success, warning, danger order.

Browse Source
This commit is contained in:
Zhang Dian 2023-09-06 13:47:35 +08:00
parent e563f860ad
commit a451b6b8b6
8 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
demo/Semi.Avalonia.Demo/Pages/LabelDemo.axaml
View File

@ -38,9 +38,9 @@
<TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock> <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
<TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock> <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
<TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock> <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
<TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock> <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
<TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock> <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
<TextBlock Grid.Row="8" Grid.Column="0">Success</TextBlock> <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
<TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock> <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
<TextBlock Grid.Row="10" Grid.Column="0">Code</TextBlock> <TextBlock Grid.Row="10" Grid.Column="0">Code</TextBlock>
<Label Grid.Row="2" Grid.Column="1">Text</Label> <Label Grid.Row="2" Grid.Column="1">Text</Label>
@ -65,20 +65,20 @@
<Label <Label
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="Warning"> Classes="Success">
Warning Success
</Label> </Label>
<Label <Label
Grid.Row="7" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="Danger"> Classes="Warning">
Danger Warning
</Label> </Label>
<Label <Label
Grid.Row="8" Grid.Row="8"
Grid.Column="1" Grid.Column="1"
Classes="Success"> Classes="Danger">
Success Danger
</Label> </Label>
<Label <Label
Grid.Row="9" Grid.Row="9"

18
demo/Semi.Avalonia.Demo/Pages/SelectableTextBlock.axaml
View File

@ -31,9 +31,9 @@
<SelectableTextBlock Grid.Row="3" Grid.Column="0">Secondary</SelectableTextBlock> <SelectableTextBlock Grid.Row="3" Grid.Column="0">Secondary</SelectableTextBlock>
<SelectableTextBlock Grid.Row="4" Grid.Column="0">Tertiary</SelectableTextBlock> <SelectableTextBlock Grid.Row="4" Grid.Column="0">Tertiary</SelectableTextBlock>
<SelectableTextBlock Grid.Row="5" Grid.Column="0">Quaternary</SelectableTextBlock> <SelectableTextBlock Grid.Row="5" Grid.Column="0">Quaternary</SelectableTextBlock>
<SelectableTextBlock Grid.Row="6" Grid.Column="0">Warning</SelectableTextBlock> <SelectableTextBlock Grid.Row="6" Grid.Column="0">Success</SelectableTextBlock>
<SelectableTextBlock Grid.Row="7" Grid.Column="0">Danger</SelectableTextBlock> <SelectableTextBlock Grid.Row="7" Grid.Column="0">Warning</SelectableTextBlock>
<SelectableTextBlock Grid.Row="8" Grid.Column="0">Success</SelectableTextBlock> <SelectableTextBlock Grid.Row="8" Grid.Column="0">Danger</SelectableTextBlock>
<SelectableTextBlock Grid.Row="9" Grid.Column="0">Mark</SelectableTextBlock> <SelectableTextBlock Grid.Row="9" Grid.Column="0">Mark</SelectableTextBlock>
<SelectableTextBlock Grid.Row="10" Grid.Column="0">Underline</SelectableTextBlock> <SelectableTextBlock Grid.Row="10" Grid.Column="0">Underline</SelectableTextBlock>
<SelectableTextBlock Grid.Row="11" Grid.Column="0">Delete</SelectableTextBlock> <SelectableTextBlock Grid.Row="11" Grid.Column="0">Delete</SelectableTextBlock>
@ -60,20 +60,20 @@
<SelectableTextBlock <SelectableTextBlock
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="Warning"> Classes="Success">
Warning Success
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="7" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="Danger"> Classes="Warning">
Danger Warning
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="8" Grid.Row="8"
Grid.Column="1" Grid.Column="1"
Classes="Success"> Classes="Danger">
Success Danger
</SelectableTextBlock> </SelectableTextBlock>
<SelectableTextBlock <SelectableTextBlock
Grid.Row="9" Grid.Row="9"

18
demo/Semi.Avalonia.Demo/Pages/TextBlockDemo.axaml
View File

@ -31,9 +31,9 @@
<TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock> <TextBlock Grid.Row="3" Grid.Column="0">Secondary</TextBlock>
<TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock> <TextBlock Grid.Row="4" Grid.Column="0">Tertiary</TextBlock>
<TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock> <TextBlock Grid.Row="5" Grid.Column="0">Quaternary</TextBlock>
<TextBlock Grid.Row="6" Grid.Column="0">Warning</TextBlock> <TextBlock Grid.Row="6" Grid.Column="0">Success</TextBlock>
<TextBlock Grid.Row="7" Grid.Column="0">Danger</TextBlock> <TextBlock Grid.Row="7" Grid.Column="0">Warning</TextBlock>
<TextBlock Grid.Row="8" Grid.Column="0">Success</TextBlock> <TextBlock Grid.Row="8" Grid.Column="0">Danger</TextBlock>
<TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock> <TextBlock Grid.Row="9" Grid.Column="0">Mark</TextBlock>
<TextBlock Grid.Row="10" Grid.Column="0">Underline</TextBlock> <TextBlock Grid.Row="10" Grid.Column="0">Underline</TextBlock>
<TextBlock Grid.Row="11" Grid.Column="0">Delete</TextBlock> <TextBlock Grid.Row="11" Grid.Column="0">Delete</TextBlock>
@ -60,20 +60,20 @@
<TextBlock <TextBlock
Grid.Row="6" Grid.Row="6"
Grid.Column="1" Grid.Column="1"
Classes="Warning"> Classes="Success">
Warning Success
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="7" Grid.Row="7"
Grid.Column="1" Grid.Column="1"
Classes="Danger"> Classes="Warning">
Danger Warning
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="8" Grid.Row="8"
Grid.Column="1" Grid.Column="1"
Classes="Success"> Classes="Danger">
Success Danger
</TextBlock> </TextBlock>
<TextBlock <TextBlock
Grid.Row="9" Grid.Row="9"

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

@ -108,15 +108,15 @@
<Style Selector="^.Quaternary"> <Style Selector="^.Quaternary">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" /> <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
</Style> </Style>
<Style Selector="^.Success">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
</Style>
<Style Selector="^.Warning"> <Style Selector="^.Warning">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockWarningForeground}" /> <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
</Style> </Style>
<Style Selector="^.Danger"> <Style Selector="^.Danger">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDangerForeground}" /> <Setter Property="Label.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
</Style> </Style>
<Style Selector="^.Success">
<Setter Property="Label.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
</Style>
<Style Selector="^.Mark"> <Style Selector="^.Mark">
<Setter Property="Label.Background" Value="{DynamicResource TextBlockMarkBackground}" /> <Setter Property="Label.Background" Value="{DynamicResource TextBlockMarkBackground}" />
</Style> </Style>

6
src/Semi.Avalonia/Controls/SelectableTextBlock.axaml
View File

@ -26,15 +26,15 @@
<Style Selector="^.Quaternary"> <Style Selector="^.Quaternary">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" /> <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
</Style> </Style>
<Style Selector="^.Success">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
</Style>
<Style Selector="^.Warning"> <Style Selector="^.Warning">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" /> <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
</Style> </Style>
<Style Selector="^.Danger"> <Style Selector="^.Danger">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" /> <Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
</Style> </Style>
<Style Selector="^.Success">
<Setter Property="SelectableTextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
</Style>
<Style Selector="^.Mark"> <Style Selector="^.Mark">
<Setter Property="SelectableTextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" /> <Setter Property="SelectableTextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" />
</Style> </Style>

6
src/Semi.Avalonia/Controls/TextBlock.axaml
View File

@ -18,15 +18,15 @@
<Style Selector="^.Quaternary"> <Style Selector="^.Quaternary">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" /> <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockQuaternaryForeground}" />
</Style> </Style>
<Style Selector="^.Success">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
</Style>
<Style Selector="^.Warning"> <Style Selector="^.Warning">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" /> <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockWarningForeground}" />
</Style> </Style>
<Style Selector="^.Danger"> <Style Selector="^.Danger">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" /> <Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockDangerForeground}" />
</Style> </Style>
<Style Selector="^.Success">
<Setter Property="TextBlock.Foreground" Value="{DynamicResource TextBlockSuccessForeground}" />
</Style>
<Style Selector="^.Mark"> <Style Selector="^.Mark">
<Setter Property="TextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" /> <Setter Property="TextBlock.Background" Value="{DynamicResource TextBlockMarkBackground}" />
</Style> </Style>

2
src/Semi.Avalonia/Themes/Dark/TextBlock.axaml
View File

@ -3,9 +3,9 @@
<SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#F9F9F9" /> <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#F9F9F9" />
<SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.6" Color="#F9F9F9" /> <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.6" Color="#F9F9F9" />
<SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#F9F9F9" /> <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#F9F9F9" />
<SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#5DC264" />
<SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FFAE43" /> <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FFAE43" />
<SolidColorBrush x:Key="TextBlockDangerForeground" Color="#FC725A" /> <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#FC725A" />
<SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#5DC264" />
<SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" /> <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#F9F9F9" />
<SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#F9F9F9" /> <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#F9F9F9" />
<SolidColorBrush x:Key="TextBlockMarkBackground" Color="#053170" /> <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#053170" />

2
src/Semi.Avalonia/Themes/Light/TextBlock.axaml
View File

@ -3,9 +3,9 @@
<SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#1C1F23" /> <SolidColorBrush x:Key="TextBlockSecondaryForeground" Opacity="0.8" Color="#1C1F23" />
<SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#1C1F23" /> <SolidColorBrush x:Key="TextBlockTertiaryForeground" Opacity="0.62" Color="#1C1F23" />
<SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#1C1F23" /> <SolidColorBrush x:Key="TextBlockQuaternaryForeground" Opacity="0.35" Color="#1C1F23" />
<SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#3BB346" />
<SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FC8800" /> <SolidColorBrush x:Key="TextBlockWarningForeground" Color="#FC8800" />
<SolidColorBrush x:Key="TextBlockDangerForeground" Color="#F93920" /> <SolidColorBrush x:Key="TextBlockDangerForeground" Color="#F93920" />
<SolidColorBrush x:Key="TextBlockSuccessForeground" Color="#3BB346" />
<SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#1C1F23" /> <SolidColorBrush x:Key="TextBlockDisabledForeground" Opacity="0.35" Color="#1C1F23" />
<SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#1C1F23" /> <SolidColorBrush x:Key="TextBlockCodeForeground" Opacity="0.68" Color="#1C1F23" />
<SolidColorBrush x:Key="TextBlockMarkBackground" Color="#EAF5FF" /> <SolidColorBrush x:Key="TextBlockMarkBackground" Color="#EAF5FF" />