|
31 | 31 | </ResourceDictionary> |
32 | 32 | </ResourceDictionary.ThemeDictionaries> |
33 | 33 |
|
34 | | - <x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonSize">40</x:Double> |
35 | 34 | <Thickness x:Key="SystemControlMSEdgeNotificationDismissButtonMargin">24,0,0,0</Thickness> |
| 35 | + <x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonSize">32</x:Double> |
36 | 36 | <x:Double x:Key="SystemControlMSEdgeNotificationDismissButtonTranslate">18</x:Double> |
37 | | - <VerticalAlignment x:Key="SystemControlMSEdgeNotificationDismissButtonVerticalAlignment">Center</VerticalAlignment> |
| 37 | + <VerticalAlignment x:Key="SystemControlMSEdgeNotificationDismissButtonVerticalAlignment">Top</VerticalAlignment> |
38 | 38 | <Thickness x:Key="SystemControlMSEdgeNotificationButtonBorderThickness">2</Thickness> |
39 | 39 |
|
40 | 40 | <Style x:Key="DismissTextBlockButtonStyle" |
|
48 | 48 | <Setter Property="Template"> |
49 | 49 | <Setter.Value> |
50 | 50 | <ControlTemplate TargetType="ButtonBase"> |
51 | | - <Grid x:Name="RootGrid" |
52 | | - Margin="{TemplateBinding Padding}" |
53 | | - Background="{TemplateBinding Background}"> |
| 51 | + <Grid x:Name="RootGrid" CornerRadius="2" Background="{ThemeResource ButtonPointerOverBackgroundThemeBrush}" |
| 52 | + Margin="{TemplateBinding Margin}" |
| 53 | + Height="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}" |
| 54 | + Width="{StaticResource SystemControlMSEdgeNotificationDismissButtonSize}"> |
54 | 55 | <Border x:Name="TextBorder" |
55 | 56 | BorderThickness="{StaticResource SystemControlMSEdgeNotificationButtonBorderThickness}" |
56 | 57 | BorderBrush="{ThemeResource SystemControlMSEdgeNotificationButtonBorderBrush}"> |
|
65 | 66 | <VisualState x:Name="Normal" /> |
66 | 67 | <VisualState x:Name="PointerOver"> |
67 | 68 | <Storyboard> |
68 | | - <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Text" |
69 | | - Storyboard.TargetProperty="Foreground"> |
70 | | - <DiscreteObjectKeyFrame KeyTime="0" |
71 | | - Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverForegroundBrush}" /> |
72 | | - </ObjectAnimationUsingKeyFrames> |
73 | 69 | <ObjectAnimationUsingKeyFrames Storyboard.TargetName="RootGrid" |
74 | 70 | Storyboard.TargetProperty="Background"> |
75 | 71 | <DiscreteObjectKeyFrame KeyTime="0" |
76 | | - Value="{ThemeResource SystemControlMSEdgeNotificationPointerOverChromeBrush}" /> |
| 72 | + Value="{ThemeResource ButtonPointerOverBackgroundThemeBrush}" /> |
77 | 73 | </ObjectAnimationUsingKeyFrames> |
78 | 74 | </Storyboard> |
79 | 75 | </VisualState> |
|
145 | 141 | VerticalAlignment="{TemplateBinding VerticalContentAlignment}" |
146 | 142 | HorizontalContentAlignment="Stretch" |
147 | 143 | VerticalContentAlignment="Center" |
| 144 | + FontWeight="SemiBold" |
148 | 145 | ContentTransitions="{TemplateBinding ContentTransitions}" |
149 | | - TextWrapping="WrapWholeWords" /> |
| 146 | + TextWrapping="Wrap" /> |
150 | 147 |
|
151 | 148 | <Button x:Name="PART_DismissButton" |
152 | 149 | Grid.Column="1" |
153 | | - Margin="{StaticResource SystemControlMSEdgeNotificationDismissButtonMargin}" |
| 150 | + Margin="0" Width="auto" |
154 | 151 | AutomationProperties.Name="Dismiss" |
155 | 152 | Content="" |
156 | 153 | FontFamily="Segoe MDL2 Assets" |
157 | | - FontSize="16" |
| 154 | + FontSize="12" |
158 | 155 | VerticalAlignment="{StaticResource SystemControlMSEdgeNotificationDismissButtonVerticalAlignment}" |
159 | 156 | Style="{StaticResource DismissTextBlockButtonStyle}"> |
160 | 157 | <Button.RenderTransform> |
161 | | - <TranslateTransform x:Name="DismissButtonTransform" X="18" /> |
| 158 | + <TranslateTransform x:Name="DismissButtonTransform" X="18" Y="-8"/> |
162 | 159 | </Button.RenderTransform> |
163 | 160 | </Button> |
164 | 161 | </Grid> |
|
0 commit comments