Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DatePicker | TimePicker] Update visual styles #4460

Merged
merged 31 commits into from Mar 29, 2021
Merged

[DatePicker | TimePicker] Update visual styles #4460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
bf93773
Lift datepicker themes
almedina-ms Mar 4, 2021
e86916e
Merge branch 'master' into user/almedina-ms/DatePicker_VisualStyleUpd…
almedina-ms Mar 4, 2021
d4e3fa4
Fix margin but LoopingSelector style is not respected
almedina-ms Mar 5, 2021
66ee2c7
Update DatePicker styles to match design
almedina-ms Mar 5, 2021
d61b871
Fix colors in control
almedina-ms Mar 5, 2021
e7b9c88
Update Highlight color
almedina-ms Mar 9, 2021
143bff7
Fix Highligh color for TimePicker dark mode
almedina-ms Mar 9, 2021
8985e36
Fix some colors for dark theme
almedina-ms Mar 10, 2021
f1436bf
Fix highlight color on TimePicker, corner radius on highlighted date …
almedina-ms Mar 10, 2021
1543d76
Fix margins for accept/dismiss buttons
almedina-ms Mar 10, 2021
6207637
Merge branch 'user/jevansaks/datepickerhighlightrect' into user/almed…
almedina-ms Mar 10, 2021
f711800
Fix up/down buttons margin
almedina-ms Mar 10, 2021
8e7d370
Fix color keys and date/time pickers borders
almedina-ms Mar 10, 2021
f73ef3a
Fix everything but the plaveholder font color
almedina-ms Mar 11, 2021
41ab773
Fix focus state for placeholders
almedina-ms Mar 12, 2021
f536358
Format all files
almedina-ms Mar 12, 2021
c78b796
Remove extra variables
almedina-ms Mar 12, 2021
fa07ec5
Fix crash for pre 21h1 builds
almedina-ms Mar 12, 2021
1b95a0b
Activate DatePicker as test
almedina-ms Mar 12, 2021
dc41eb1
Fix border brushes and update timepicker to match datepicker
almedina-ms Mar 13, 2021
0abbb8f
Remove extra border on focus + pointer
almedina-ms Mar 15, 2021
6ea1c12
Remove accent background color for focus state
almedina-ms Mar 17, 2021
da70a96
Merge branch 'master' into user/almedina-ms/DatePicker_VisualStyleUpd…
almedina-ms Mar 18, 2021
7c2aed3
Fix missing reference to caret icons
almedina-ms Mar 18, 2021
1fb0a78
Remove left over changes from old focus behaviour
almedina-ms Mar 18, 2021
54b1587
Remove changes from old focus behaviour for TimePicker
almedina-ms Mar 18, 2021
33be511
Fix contrast missing key
almedina-ms Mar 18, 2021
7f57c1e
Merge branch 'user/jevansaks/datepickerhighlightrect' into user/almed…
almedina-ms Mar 18, 2021
4d1c0b9
Merge branch 'user/jevansaks/datepickerhighlightrect' into user/almed…
almedina-ms Mar 23, 2021
400d3b6
Remove added but unused colors
almedina-ms Mar 29, 2021
77c906c
Remove another unused resource
almedina-ms Mar 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
67 changes: 0 additions & 67 deletions dev/CommonStyles/Common_themeresources.xaml
View file
Open in desktop
Expand Up @@ -54,71 +54,4 @@
<controls:TextCommandBarFlyout x:Key="TextControlCommandBarContextFlyout" Placement="BottomEdgeAlignedLeft" />
<controls:TextCommandBarFlyout x:Key="TextControlCommandBarSelectionFlyout" Placement="TopEdgeAlignedLeft" />

<Style TargetType="LoopingSelector">
<Setter Property="ShouldLoop" Value="True" />
<Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
<Setter Property="ItemTemplate">
<Setter.Value>
<DataTemplate>
<StackPanel VerticalAlignment="Center">
<TextBlock Text="{Binding PrimaryText}" FontFamily="{ThemeResource ContentControlThemeFontFamily}" />
</StackPanel>
</DataTemplate>
</Setter.Value>
</Setter>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="Control">
<Grid>
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" />
<VisualState x:Name="PointerOver">
<Storyboard>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButton" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
</ObjectAnimationUsingKeyFrames>
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="DownButton" Storyboard.TargetProperty="Visibility">
<DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
</ObjectAnimationUsingKeyFrames>
</Storyboard>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>
<ScrollViewer x:Name="ScrollViewer"
VerticalSnapPointsType="Mandatory"
VerticalSnapPointsAlignment="Near"
VerticalScrollBarVisibility="Hidden"
HorizontalScrollMode="Disabled"
ZoomMode="Disabled"
Template="{StaticResource ScrollViewerScrollBarlessTemplate}" />
<RepeatButton x:Name="UpButton"
Content="&#xEDDB;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="8"
Height="22"
Padding="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Top"
Visibility="Collapsed"
Style="{StaticResource DateTimePickerFlyoutButtonStyle}"
Background="{ThemeResource LoopingSelectorButtonBackground}"
IsTabStop="False" />
<RepeatButton x:Name="DownButton"
Content="&#xEDDC;"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="8"
Height="22"
Padding="0"
HorizontalAlignment="Stretch"
VerticalAlignment="Bottom"
Visibility="Collapsed"
Style="{StaticResource DateTimePickerFlyoutButtonStyle}"
Background="{ThemeResource LoopingSelectorButtonBackground}"
IsTabStop="False" />
</Grid>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>