Skip to content

Commit 4718d4c

Browse files
committed
Card & paginator style adjustments
1 parent 45d99ec commit 4718d4c

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-14
lines changed

source/iNKORE.UI.WPF.Modern.Gallery/Controls/TileGallery.xaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls"
77
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
8-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
mc:Ignorable="d">
8+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
9+
mc:Ignorable="d" d:DesignWidth="886.575">
1010

1111
<!-- Resources -->
1212
<UserControl.Resources>
@@ -35,15 +35,18 @@
3535
<Setter Property="Template">
3636
<Setter.Value>
3737
<ControlTemplate TargetType="Button">
38-
<Border Background="{TemplateBinding Background}"
38+
<ui:DropShadowPanel BlurRadius="12"
39+
CornerRadius="{DynamicResource ControlCornerRadius}" ShadowOpacity="0.06" ShadowDepth="2" ShadowMode="Outer">
40+
<Border Background="{TemplateBinding Background}"
3941
BorderBrush="{TemplateBinding BorderBrush}"
4042
BorderThickness="{TemplateBinding BorderThickness}"
4143
CornerRadius="{DynamicResource ControlCornerRadius}">
42-
<ContentPresenter
43-
HorizontalAlignment="Center"
44-
VerticalAlignment="Center"
45-
Content="{TemplateBinding Content}" />
46-
</Border>
44+
<ContentPresenter
45+
HorizontalAlignment="Center"
46+
VerticalAlignment="Center"
47+
Content="{TemplateBinding Content}" />
48+
</Border>
49+
</ui:DropShadowPanel>
4750
</ControlTemplate>
4851
</Setter.Value>
4952
</Setter>
@@ -118,7 +121,7 @@
118121
x:Name="ScrollBackBtn"
119122
Width="16"
120123
Height="38"
121-
Margin="8,0,0,25"
124+
Margin="12,0,0,25"
122125
VerticalAlignment="Center"
123126
AutomationProperties.Name="Scroll left"
124127
Style="{StaticResource ScrollButtonStyle}"
@@ -130,7 +133,7 @@
130133
x:Name="ScrollForwardBtn"
131134
Width="16"
132135
Height="38"
133-
Margin="0,0,8,25"
136+
Margin="0,0,12,25"
134137
VerticalAlignment="Center"
135138
HorizontalAlignment="Right"
136139
AutomationProperties.Name="Scroll right"

source/iNKORE.UI.WPF.Modern.Gallery/Pages/NewControlsPage.xaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,13 @@
6666
</Border>
6767

6868
<StackPanel Grid.RowSpan="4" Margin="36,63,36,0" Orientation="Vertical" VerticalAlignment="Top">
69-
<TextBlock
70-
x:Name="smallHeaderSubtitleText"
69+
<TextBlock x:Name="smallHeaderSubtitleText"
7170
Foreground="Black"
7271
Style="{DynamicResource SubtitleTextBlockStyle}"
73-
Text="{x:Static ui:ThemeManager.AssemblyVersion}"
74-
Visibility="Visible" />
72+
Visibility="Visible" >
73+
<Run>Version</Run>
74+
<Run Text="{x:Static ui:ThemeManager.AssemblyVersion}"/>
75+
</TextBlock>
7576
<TextBlock
7677
x:Name="smallHeaderText"
7778
Foreground="Black"

0 commit comments

Comments
 (0)