Skip to content

Commit

Permalink
Make CalendarViewCalendarItemBackground the same as RS3 (#189)
Browse files Browse the repository at this point in the history 
* add SystemControlBackgroundAltHighRevealBackgroundBrush

* lift CalendarViewCalendarItemRevealBackground

* move CalendarViewCalendarItemRevealBackground to difference file
  • Loading branch information
@licanhua
licanhua authored Jan 18, 2019
1 parent 9d82fc7 commit 24713b3
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
15 changes: 12 additions & 3 deletions dev/Materials/Reveal/RevealBrush_rs1_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<!-- Background Brushes -->
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{StaticResource SystemBaseLowColor}" />
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{StaticResource SystemAltHighColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.6" />
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.8" />
Expand Down Expand Up @@ -87,7 +88,9 @@
<Thickness x:Key="ComboBoxItemRevealThemePadding">11,5,11,7</Thickness>
<Thickness x:Key="ComboBoxItemRevealThemeTouchPadding">11,11,11,13</Thickness>
<Thickness x:Key="ComboBoxItemRevealThemeGameControllerPadding">11,11,11,13</Thickness>


<StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlBackgroundAltHighRevealBackgroundBrush" />

<!-- Resources for Windows.UI.Xaml.Controls.Button -->
<StaticResource x:Key="ButtonRevealBackground" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
<StaticResource x:Key="ButtonRevealBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
Expand Down Expand Up @@ -234,6 +237,7 @@
<!-- Background Brushes -->
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{StaticResource SystemBaseLowColor}" />
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.6" />
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemAccentColor}" Opacity="0.8" />
Expand Down Expand Up @@ -288,7 +292,9 @@
<Thickness x:Key="ComboBoxItemRevealThemePadding">11,5,11,7</Thickness>
<Thickness x:Key="ComboBoxItemRevealThemeTouchPadding">11,11,11,13</Thickness>
<Thickness x:Key="ComboBoxItemRevealThemeGameControllerPadding">11,11,11,13</Thickness>


<StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlBackgroundAltHighRevealBackgroundBrush" />

<!-- Resources for Windows.UI.Xaml.Controls.Button -->
<StaticResource x:Key="ButtonRevealBackground" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
<StaticResource x:Key="ButtonRevealBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
Expand Down Expand Up @@ -435,6 +441,7 @@
<!-- Background Brushes -->
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{StaticResource SystemAltHighColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
Expand Down Expand Up @@ -489,7 +496,9 @@
<Thickness x:Key="ComboBoxItemRevealThemePadding">11,5,11,7</Thickness>
<Thickness x:Key="ComboBoxItemRevealThemeTouchPadding">11,11,11,13</Thickness>
<Thickness x:Key="ComboBoxItemRevealThemeGameControllerPadding">11,11,11,13</Thickness>


<StaticResource x:Key="CalendarViewCalendarItemRevealBackground" ResourceKey="SystemControlBackgroundAltHighRevealBackgroundBrush" />

<!-- Resources for Windows.UI.Xaml.Controls.Button -->
<StaticResource x:Key="ButtonRevealBackground" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
<StaticResource x:Key="ButtonRevealBackgroundPointerOver" ResourceKey="SystemControlBackgroundBaseLowRevealBackgroundBrush" />
Expand Down
11 changes: 11 additions & 0 deletions dev/Materials/Reveal/RevealBrush_rs2_themeresources.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
TargetTheme="Dark"
Color="Transparent"
FallbackColor="Transparent"/>
<local:RevealBackgroundBrush
x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush"
TargetTheme="Dark"
Color="{StaticResource SystemAltHighColor}"
FallbackColor="{StaticResource SystemAltHighColor}" />
<local:RevealBackgroundBrush
x:Key="SystemControlHighlightAccentRevealBackgroundBrush"
TargetTheme="Dark"
Expand Down Expand Up @@ -400,6 +405,11 @@
TargetTheme="Light"
Color="Transparent"
FallbackColor="Transparent"/>
<local:RevealBackgroundBrush
x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush"
TargetTheme="Light"
Color="{StaticResource SystemAltHighColor}"
FallbackColor="{StaticResource SystemAltHighColor}" />
<local:RevealBackgroundBrush
x:Key="SystemControlHighlightAccentRevealBackgroundBrush"
TargetTheme="Light"
Expand Down Expand Up @@ -736,6 +746,7 @@
<!-- Background Brushes -->
<SolidColorBrush x:Key="SystemControlBackgroundBaseLowRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="SystemControlTransparentRevealBackgroundBrush" Color="Transparent" />
<SolidColorBrush x:Key="SystemControlBackgroundAltHighRevealBackgroundBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccentRevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccent3RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="SystemControlHighlightAccent2RevealBackgroundBrush" Color="{ThemeResource SystemColorHighlightColor}" />
Expand Down

0 comments on commit 24713b3

Please sign in to comment.