chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: replace Bold by {DynamicResource TextBlockTitleFontWeight}

Browse Source
This commit is contained in:
rabbitism
2024-07-24 18:18:55 +08:00
parent a92e68269f
commit 9ce5ac6691
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Ursa.Themes.Semi/Controls/Banner.axaml
View File

@@ -43,7 +43,7 @@
ContentTemplate="{TemplateBinding HeaderTemplate}" ContentTemplate="{TemplateBinding HeaderTemplate}"
IsVisible="{TemplateBinding Header, IsVisible="{TemplateBinding Header,
Converter={x:Static ObjectConverters.IsNotNull}}" Converter={x:Static ObjectConverters.IsNotNull}}"
TextElement.FontWeight="600" /> TextElement.FontWeight="{DynamicResource TextBlockTitleFontWeight}" />
<ContentPresenter <ContentPresenter
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"

2
src/Ursa.Themes.Semi/Controls/Breadcrumb.axaml
View File

@@ -70,7 +70,7 @@
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter"> <Style Selector="^ /template/ ContentPresenter#PART_ContentPresenter">
<Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" /> <Setter Property="Foreground" Value="{DynamicResource SemiColorText0}" />
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
</Style> </Style>
<Style Selector="^ /template/ ContentPresenter#Separator"> <Style Selector="^ /template/ ContentPresenter#Separator">
<Setter Property="IsVisible" Value="False" /> <Setter Property="IsVisible" Value="False" />

6
src/Ursa.Themes.Semi/Controls/Dialog.axaml
View File

@@ -190,7 +190,7 @@
Margin="0,24,0,0" Margin="0,24,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
IsHitTestVisible="False" IsHitTestVisible="False"
IsVisible="{TemplateBinding Title, IsVisible="{TemplateBinding Title,
Converter={x:Static ObjectConverters.IsNotNull}}" Converter={x:Static ObjectConverters.IsNotNull}}"
@@ -490,7 +490,7 @@
Grid.Column="0" Grid.Column="0"
Margin="24,24,0,0" Margin="24,24,0,0"
FontSize="14" FontSize="14"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
Text="{TemplateBinding Title}" Text="{TemplateBinding Title}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
TextWrapping="NoWrap" /> TextWrapping="NoWrap" />
@@ -563,7 +563,7 @@
Margin="0,24,0,0" Margin="0,24,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
IsHitTestVisible="False" IsHitTestVisible="False"
IsVisible="{TemplateBinding Title, IsVisible="{TemplateBinding Title,
Converter={x:Static ObjectConverters.IsNotNull}}" Converter={x:Static ObjectConverters.IsNotNull}}"

2
src/Ursa.Themes.Semi/Controls/Drawer.axaml
View File

@@ -96,7 +96,7 @@
Margin="24,24,0,0" Margin="24,24,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
IsHitTestVisible="False" IsHitTestVisible="False"
IsVisible="{TemplateBinding Title, IsVisible="{TemplateBinding Title,
Converter={x:Static ObjectConverters.IsNotNull}}" Converter={x:Static ObjectConverters.IsNotNull}}"

6
src/Ursa.Themes.Semi/Controls/Form.axaml
View File

@@ -26,7 +26,7 @@
Margin="0,28,0,0" Margin="0,28,0,0"
Content="{TemplateBinding Header}" Content="{TemplateBinding Header}"
FontSize="18" FontSize="18"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header, Converter={x:Static ObjectConverters.IsNotNull}}" /> IsVisible="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header, Converter={x:Static ObjectConverters.IsNotNull}}" />
<Rectangle <Rectangle
Height="1" Height="1"
@@ -50,7 +50,7 @@
Margin="0,0,0,4" Margin="0,0,0,4"
HorizontalAlignment="{TemplateBinding LabelAlignment}" HorizontalAlignment="{TemplateBinding LabelAlignment}"
Orientation="Horizontal"> Orientation="Horizontal">
<ContentPresenter Content="{TemplateBinding Label}" FontWeight="Bold" /> <ContentPresenter Content="{TemplateBinding Label}" FontWeight="{DynamicResource TextBlockTitleFontWeight}" />
<TextBlock <TextBlock
Foreground="{DynamicResource SemiRed6}" Foreground="{DynamicResource SemiRed6}"
IsVisible="{TemplateBinding IsRequired}" IsVisible="{TemplateBinding IsRequired}"
@@ -77,7 +77,7 @@
Margin="8,8,8,0" Margin="8,8,8,0"
HorizontalAlignment="{TemplateBinding LabelAlignment}" HorizontalAlignment="{TemplateBinding LabelAlignment}"
Orientation="Horizontal"> Orientation="Horizontal">
<ContentPresenter Content="{TemplateBinding Label}" FontWeight="Bold" /> <ContentPresenter Content="{TemplateBinding Label}" FontWeight="{DynamicResource TextBlockTitleFontWeight}" />
<TextBlock <TextBlock
Foreground="{DynamicResource SemiRed6}" Foreground="{DynamicResource SemiRed6}"
IsVisible="{TemplateBinding IsRequired}" IsVisible="{TemplateBinding IsRequired}"

4
src/Ursa.Themes.Semi/Controls/MessageBox.axaml
View File

@@ -51,7 +51,7 @@
Grid.Column="1" Grid.Column="1"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
IsHitTestVisible="False" IsHitTestVisible="False"
Text="{TemplateBinding Title}" Text="{TemplateBinding Title}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"
@@ -184,7 +184,7 @@
Margin="0,24,0,0" Margin="0,24,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="16" FontSize="16"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
IsHitTestVisible="False" IsHitTestVisible="False"
Text="{TemplateBinding Title}" Text="{TemplateBinding Title}"
TextTrimming="CharacterEllipsis" TextTrimming="CharacterEllipsis"

2
src/Ursa.Themes.Semi/Controls/Pagination.axaml
View File

@@ -126,7 +126,7 @@
<Style Selector="^:selected"> <Style Selector="^:selected">
<Setter Property="Background" Value="{DynamicResource PaginationButtonSelectedBackground}" /> <Setter Property="Background" Value="{DynamicResource PaginationButtonSelectedBackground}" />
<Setter Property="Foreground" Value="{DynamicResource PaginationButtonSelectedForeground}" /> <Setter Property="Foreground" Value="{DynamicResource PaginationButtonSelectedForeground}" />
<Setter Property="FontWeight" Value="600" /> <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>

2
src/Ursa.Themes.Semi/Controls/SelectionList.axaml
View File

@@ -55,7 +55,7 @@
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:selected"> <Style Selector="^:selected">
<Setter Property="FontWeight" Value="Bold" /> <Setter Property="FontWeight" Value="{DynamicResource TextBlockTitleFontWeight}" />
</Style> </Style>
</ControlTheme> </ControlTheme>
</ResourceDictionary> </ResourceDictionary>

4
src/Ursa.Themes.Semi/Controls/TimeRangePicker.axaml
View File

@@ -119,14 +119,14 @@
Grid.Column="0" Grid.Column="0"
Margin="0,16" Margin="0,16"
HorizontalAlignment="Center" HorizontalAlignment="Center"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
Text="{DynamicResource STRING_DATE_TIME_START_TIME}" /> Text="{DynamicResource STRING_DATE_TIME_START_TIME}" />
<TextBlock <TextBlock
Grid.Row="0" Grid.Row="0"
Grid.Column="2" Grid.Column="2"
Margin="0,16" Margin="0,16"
HorizontalAlignment="Center" HorizontalAlignment="Center"
FontWeight="Bold" FontWeight="{DynamicResource TextBlockTitleFontWeight}"
Text="{DynamicResource STRING_DATE_TIME_END_TIME}" /> Text="{DynamicResource STRING_DATE_TIME_END_TIME}" />
<Rectangle <Rectangle
Grid.Row="1" Grid.Row="1"