| |
@@ -24,7 +24,8 @@ |
| 24 |
24 |
|
<Thickness x:Key="TextControlHeaderMarginThemeThickness">0,0,0,4.8</Thickness> |
| 25 |
25 |
|
<SolidColorBrush x:Key="TextBoxDisabledBackgroundThemeBrush" Color="Transparent"/> |
| 26 |
26 |
|
<x:Double x:Key="TextControlBorderThemeOpacity">0.8</x:Double> |
| 27 |
|
- |
|
| |
27 |
+ |
|
| |
28 |
+ |
<SolidColorBrush x:Key="ButtonPressedBackgroundThemeBrush2" Color="#2cdaff" /> |
| 28 |
29 |
|
|
| 29 |
30 |
|
<Style x:Key="TextBoxStyleDefault" TargetType="TextBox"> |
| 30 |
31 |
|
<Setter Property="MinWidth" Value="{ThemeResource TextControlThemeMinWidth}"/> |
| |
@@ -41,11 +42,12 @@ |
| 41 |
42 |
|
|
| 42 |
43 |
|
<Setter Property="Background" Value="#d1d1d1"/> |
| 43 |
44 |
|
<Setter Property="Margin" Value="0,3"></Setter> |
| 44 |
|
- |
<Setter Property="Padding" Value="0,0,5,0"></Setter> |
| |
45 |
+ |
<Setter Property="Padding" Value="10,5"></Setter> |
| 45 |
46 |
|
<Setter Property="FontSize" Value="16"></Setter> |
| |
47 |
+ |
<Setter Property="MinHeight" Value="51"></Setter> |
| 46 |
48 |
|
<Setter Property="VerticalAlignment" Value="Stretch"></Setter> |
| 47 |
49 |
|
<Setter Property="HorizontalAlignment" Value="Stretch"></Setter> |
| 48 |
|
- |
<Setter Property="TextAlignment" Value="Center"></Setter> |
| |
50 |
+ |
<Setter Property="TextAlignment" Value="Left"></Setter> |
| 49 |
51 |
|
<Setter Property="BorderThickness" Value="1.5"/> |
| 50 |
52 |
|
<Setter Property="SelectionHighlightColor" Value="#FF2CDAFF"/> |
| 51 |
53 |
|
|
| |
@@ -130,7 +132,7 @@ |
| 130 |
132 |
|
|
| 131 |
133 |
|
<Setter Property="Background" Value="#d1d1d1"/> |
| 132 |
134 |
|
<Setter Property="Margin" Value="0,3"></Setter> |
| 133 |
|
- |
<Setter Property="Padding" Value="0,0,5,0"></Setter> |
| |
135 |
+ |
<Setter Property="Padding" Value="5,0"></Setter> |
| 134 |
136 |
|
<Setter Property="FontSize" Value="16"></Setter> |
| 135 |
137 |
|
<Setter Property="VerticalAlignment" Value="Stretch"></Setter> |
| 136 |
138 |
|
<Setter Property="HorizontalAlignment" Value="Stretch"></Setter> |
| |
@@ -209,8 +211,8 @@ |
| 209 |
211 |
|
</VisualStateGroup> |
| 210 |
212 |
|
</VisualStateManager.VisualStateGroups> |
| 211 |
213 |
|
<Border x:Name="BorderElement" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Grid.Row="1"/> |
| 212 |
|
- |
<ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Left" x:Name="HeaderContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Margin="{ThemeResource TextControlHeaderMarginThemeThickness}" Grid.Row="0" Style="{StaticResource HeaderContentPresenterStyle}"/> |
| 213 |
|
- |
<ScrollViewer x:Name="ContentElement" VerticalAlignment="Center" HorizontalContentAlignment="Center" Grid.Row="0" Grid.RowSpan="2" AutomationProperties.AccessibilityView="Raw" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" IsTabStop="False" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" Margin="{ThemeResource RichEditBoxTextThemeMargin}" MinHeight="{ThemeResource TextControlThemeMinHeight}" Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" ZoomMode="Disabled"/> |
| |
214 |
+ |
<ContentPresenter VerticalAlignment="Center" HorizontalAlignment="Center" x:Name="HeaderContentPresenter" ContentTemplate="{TemplateBinding HeaderTemplate}" Content="{TemplateBinding Header}" Margin="{ThemeResource TextControlHeaderMarginThemeThickness}" Grid.Row="0" Style="{StaticResource HeaderContentPresenterStyle}"/> |
| |
215 |
+ |
<ScrollViewer MinWidth="300" x:Name="ContentElement" VerticalAlignment="Center" Grid.Row="0" Grid.RowSpan="2" AutomationProperties.AccessibilityView="Raw" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" IsTabStop="False" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" Margin="{ThemeResource RichEditBoxTextThemeMargin}" MinHeight="{ThemeResource TextControlThemeMinHeight}" Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" ZoomMode="Disabled"/> |
| 214 |
216 |
|
<ContentControl VerticalAlignment="Center" HorizontalAlignment="Center" x:Name="PlaceholderTextContentPresenter" Content="{TemplateBinding PlaceholderText}" Foreground="{ThemeResource TextBoxPlaceholderTextThemeBrush}" FontSize="{ThemeResource ContentControlFontSize}" IsTabStop="False" Margin="{ThemeResource RichEditBoxTextThemeMargin}" Padding="{TemplateBinding Padding}" Grid.Row="1"/> |
| 215 |
217 |
|
<CheckBox x:Name="RevealButton" Foreground="{ThemeResource TextBoxForegroundHeaderThemeBrush}" VerticalAlignment="Center" HorizontalAlignment="Center" IsTabStop="False" Margin="{ThemeResource PasswordBoxCheckBoxThemeMargin}" Grid.Row="2" Visibility="Collapsed" /> |
| 216 |
218 |
|
</Grid> |
| |
@@ -220,15 +222,7 @@ |
| 220 |
222 |
|
</Style> |
| 221 |
223 |
|
|
| 222 |
224 |
|
|
| 223 |
|
- |
|
| 224 |
|
- |
|
| 225 |
|
- |
|
| 226 |
|
- |
|
| 227 |
|
- |
|
| 228 |
|
- |
|
| 229 |
|
- |
|
| 230 |
|
- |
|
| 231 |
|
- |
|
| |
225 |
+ |
|
| 232 |
226 |
|
<Thickness x:Key="PhoneBorderThickness">2.5</Thickness> |
| 233 |
227 |
|
<FontWeight x:Key="PhoneButtonFontWeight">Semibold</FontWeight> |
| 234 |
228 |
|
<x:Double x:Key="TextStyleLargeFontSize">18.14</x:Double> |
| |
@@ -284,7 +278,7 @@ |
| 284 |
278 |
|
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonPressedForegroundThemeBrush}"/> |
| 285 |
279 |
|
</ObjectAnimationUsingKeyFrames> |
| 286 |
280 |
|
<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Background" Storyboard.TargetName="Border"> |
| 287 |
|
- |
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonPressedBackgroundThemeBrush}"/> |
| |
281 |
+ |
<DiscreteObjectKeyFrame KeyTime="0" Value="{StaticResource ButtonPressedBackgroundThemeBrush2}"/> |
| 288 |
282 |
|
</ObjectAnimationUsingKeyFrames> |
| 289 |
283 |
|
</Storyboard> |
| 290 |
284 |
|
</VisualState> |
View this file contents
View the full history
Commits for