Skip to content

Commit 08cf424

Browse files
committed
Fix Card Padding and Margin #88
1 parent af61073 commit 08cf424

2 files changed

Lines changed: 15 additions & 4 deletions

File tree

dev/DevWinUI.Controls/Themes/Generic.xaml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ Themes\Styles\Controls\StorageRing.xaml
9494
Themes\Styles\Controls\TextBox.xaml
9595
Themes\Styles\Controls\TransitioningContentControl.xaml
9696
Themes\Styles\Controls\Validation.xaml
97+
Themes\Styles\Controls\WanderingParticles.xaml
9798
Themes\Styles\Controls\WaveProgressBar.xaml
9899
Themes\Styles\Win2D\BubbleButton.xaml
99100
Themes\Styles\Win2D\BubbleProgressButton.xaml
@@ -865,7 +866,7 @@ Themes\Styles\Win2D\Watermark.xaml
865866
<Setter Property="Foreground" Value="{ThemeResource TextFillColorTertiaryBrush}" />
866867
</Style>
867868
<Style x:Key="DefaultCardStyle" TargetType="local:Card">
868-
<Setter Property="Padding" Value="8" />
869+
<Setter Property="Padding" Value="24" />
869870
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
870871
<Setter Property="VerticalContentAlignment" Value="Stretch" />
871872
<Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
@@ -896,7 +897,7 @@ Themes\Styles\Win2D\Watermark.xaml
896897
<ColumnDefinition Width="*" />
897898
<ColumnDefinition Width="Auto" />
898899
</Grid.ColumnDefinitions>
899-
<TextBlock Margin="16,0,0,0" VerticalAlignment="Center" FontSize="16" FontWeight="SemiBold" Text="{TemplateBinding Title}" />
900+
<TextBlock Margin="24,0,0,0" VerticalAlignment="Center" FontSize="16" FontWeight="SemiBold" Text="{TemplateBinding Title}" />
900901
<ContentPresenter Grid.Column="2" HorizontalAlignment="Right" VerticalAlignment="Center" Content="{TemplateBinding TitleContent}" />
901902
</Grid>
902903
<Rectangle x:Name="Divider" Grid.Row="1" Height="1" HorizontalAlignment="Stretch" Fill="{ThemeResource DividerStrokeColorDefaultBrush}" Visibility="{TemplateBinding DividerVisibility}" />
@@ -2970,6 +2971,15 @@ Themes\Styles\Win2D\Watermark.xaml
29702971
</DoubleAnimation.EasingFunction>
29712972
</DoubleAnimation>
29722973
</Storyboard>
2974+
<Style x:Key="DefaultWanderingParticlesStyle" TargetType="local:WanderingParticles">
2975+
<Setter Property="Template">
2976+
<Setter.Value>
2977+
<ControlTemplate TargetType="local:WanderingParticles">
2978+
<Grid x:Name="PART_Container" />
2979+
</ControlTemplate>
2980+
</Setter.Value>
2981+
</Setter>
2982+
</Style>
29732983
<ControlTemplate x:Key="CompletedTemplate" TargetType="ContentControl">
29742984
<Grid x:Name="CompletedElement" Margin="-2">
29752985
<Ellipse x:Name="CompletedRectangle" Fill="{ThemeResource ProgressCompletedBackgroundBrush}">
@@ -9863,6 +9873,7 @@ Themes\Styles\Win2D\Watermark.xaml
98639873
</Setter.Value>
98649874
</Setter>
98659875
</Style>
9876+
<Style BasedOn="{StaticResource DefaultWanderingParticlesStyle}" TargetType="local:WanderingParticles" />
98669877
<Style x:Key="DefaultWaveProgressBarStyle" TargetType="local:WaveProgressBar">
98679878
<Setter Property="Foreground" Value="{ThemeResource TextFillColorPrimaryBrush}" />
98689879
<Setter Property="WaveFill" Value="{ThemeResource AccentAAFillColorDefaultBrush}" />

dev/DevWinUI.Controls/Themes/Styles/Controls/Card.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<Style x:Key="DefaultCardStyle"
1010
TargetType="local:Card">
11-
<Setter Property="Padding" Value="8" />
11+
<Setter Property="Padding" Value="24" />
1212
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
1313
<Setter Property="VerticalContentAlignment" Value="Stretch" />
1414
<Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />
@@ -44,7 +44,7 @@
4444
<ColumnDefinition Width="*" />
4545
<ColumnDefinition Width="Auto" />
4646
</Grid.ColumnDefinitions>
47-
<TextBlock Margin="16,0,0,0"
47+
<TextBlock Margin="24,0,0,0"
4848
VerticalAlignment="Center"
4949
FontSize="16"
5050
FontWeight="SemiBold"

0 commit comments

Comments
 (0)