|
26 | 26 | <Setter Property="BorderThickness" Value="1" />
|
27 | 27 | <Setter Property="HorizontalContentAlignment" Value="Center" />
|
28 | 28 | <Setter Property="VerticalContentAlignment" Value="Center" />
|
29 |
| - <Setter Property="Padding" Value="24 0 24 0" /> |
30 |
| - <Setter Property="Margin" Value="24 -14 -24 -14" /> |
| 29 | + <Setter Property="Height" Value="36" /> |
| 30 | + <Setter Property="Margin" Value="8 -10 -8 -10" /> |
| 31 | + <Setter Property="Padding" Value="8" /> |
31 | 32 | <Setter Property="Template">
|
32 | 33 | <Setter.Value>
|
33 | 34 | <ControlTemplate TargetType="{x:Type Button}">
|
|
46 | 47 | <Setter Property="Opacity" Value="0.23" />
|
47 | 48 | </Trigger>
|
48 | 49 | <Trigger Property="DockPanel.Dock" Value="Bottom">
|
49 |
| - <Setter Property="Margin" Value="24 0 -24 -14" /> |
50 |
| - <Setter Property="Padding" Value="24 8 24 8" /> |
| 50 | + <Setter Property="Margin" Value="0 18 -8 -8" /> |
51 | 51 | </Trigger>
|
52 | 52 | </ControlTemplate.Triggers>
|
53 | 53 | </ControlTemplate>
|
|
69 | 69 |
|
70 | 70 | <Style TargetType="wpf:SnackbarMessage">
|
71 | 71 | <Setter Property="HorizontalContentAlignment" Value="Left" />
|
| 72 | + <Setter Property="Margin" Value="16" /> |
72 | 73 | <Setter Property="Template">
|
73 | 74 | <Setter.Value>
|
74 | 75 | <ControlTemplate TargetType="wpf:SnackbarMessage">
|
75 |
| - <DockPanel MaxHeight="{Binding RelativeSource={RelativeSource AncestorType={x:Type wpf:Snackbar}}, Path=(wpf:SnackbarMessage.ContentMaxHeight)}"> |
| 76 | + <DockPanel> |
76 | 77 | <!-- will become a Panel to wrap a "pretend" button -->
|
77 | 78 | <Button x:Name="PART_ActionButton"
|
78 | 79 | Command="{TemplateBinding ActionCommand}"
|
|
98 | 99 | ContentTemplate="{TemplateBinding ContentTemplate}"
|
99 | 100 | ContentStringFormat="{TemplateBinding ContentStringFormat}"
|
100 | 101 | ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
|
101 |
| - HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"> |
| 102 | + HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" |
| 103 | + MaxHeight="{Binding RelativeSource={RelativeSource AncestorType={x:Type wpf:Snackbar}}, Path=(wpf:SnackbarMessage.ContentMaxHeight)}"> |
102 | 104 | <ContentPresenter.Resources>
|
103 | 105 | <DataTemplate DataType="{x:Type system:String}">
|
104 |
| - <TextBlock Text="{Binding}"> |
| 106 | + <TextBlock Text="{Binding}" Padding="0"> |
105 | 107 | <TextBlock.Style>
|
106 | 108 | <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource MaterialDesignBody1TextBlock}">
|
107 | 109 | <Setter Property="FontSize" Value="14" />
|
|
129 | 131 | <Setter Property="ActionButtonStyle" Value="{StaticResource MaterialDesignSnackbarActionButton}" />
|
130 | 132 | <Setter Property="MinWidth" Value="288" />
|
131 | 133 | <Setter Property="MaxWidth" Value="568" />
|
132 |
| - <Setter Property="Padding" Value="24 14 24 14" /> |
133 | 134 | <Setter Property="ClipToBounds" Value="True" />
|
134 |
| - <Setter Property="wpf:SnackbarMessage.InlineActionButtonMaxHeight" Value="53" /> |
135 |
| - <Setter Property="wpf:SnackbarMessage.ContentMaxHeight" Value="61" /> |
| 135 | + <Setter Property="wpf:SnackbarMessage.InlineActionButtonMaxHeight" Value="49" /> |
| 136 | + <Setter Property="wpf:SnackbarMessage.ContentMaxHeight" Value="36" /> |
136 | 137 | <Setter Property="Template">
|
137 | 138 | <Setter.Value>
|
138 | 139 | <ControlTemplate TargetType="wpf:Snackbar">
|
|
170 | 171 | </MultiBinding>
|
171 | 172 | </StackPanel.Height>
|
172 | 173 | <Border x:Name="ContentBorder"
|
173 |
| - Background="{TemplateBinding Background}" CornerRadius="2" SnapsToDevicePixels="True" |
| 174 | + Background="{TemplateBinding Background}" CornerRadius="3" SnapsToDevicePixels="True" |
174 | 175 | VerticalAlignment="Stretch"
|
175 |
| - MinHeight="24"> |
| 176 | + MinHeight="48"> |
176 | 177 | <ContentPresenter Content="{TemplateBinding Message}"
|
177 | 178 | VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
|
178 | 179 | Margin="{TemplateBinding Padding}"
|
|
0 commit comments