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

Update Accent Colour Brushes to System APIs #3909

Merged
merged 4 commits into from
Jan 9, 2021
Merged

Update Accent Colour Brushes to System APIs #3909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
518b5b3
update accentColors to use APIs
karkarl Jan 8, 2021
0324cd6
remove colorAnimations for accentColors
karkarl Jan 8, 2021
284ead8
remove Slider ColorAnimations for accentColors
karkarl Jan 8, 2021
81495ee
clean up
karkarl Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 12 additions & 24 deletions dev/CommonStyles/Common_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
<Color x:Key="TextFillColorDisabled">#5DFFFFFF</Color>
<Color x:Key="TextFillColorInverse">#E4000000</Color>

<Color x:Key="AccentTextFillColorPrimary">#A8E6FF</Color>
<Color x:Key="AccentTextFillColorSecondary">#A8E6FF</Color>
<Color x:Key="AccentTextFillColorTertiary">#70C2F1</Color>
<Color x:Key="AccentTextFillColorDisabled">#5DFFFFFF</Color>

<Color x:Key="TextOnAccentFillColorPrimary">#FFFFFF</Color>
Expand Down Expand Up @@ -63,9 +60,6 @@
<Color x:Key="AccentFillColorTertiary">#0084D9</Color>
<Color x:Key="AccentFillColorDisabled">#0B000000</Color>

<Color x:Key="AccentAAFillColorDefault">#70C2F1</Color>
<Color x:Key="AccentAAFillColorSecondary">#A8E6FF</Color>
<Color x:Key="AccentAAFillColorTertiary">#389DE2</Color>
<Color x:Key="AccentAAFillColorDisabled">#28FFFFFF</Color>

<Color x:Key="ControlStrokeColorDefault">#33000000</Color>
Expand Down Expand Up @@ -121,9 +115,9 @@
<SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource TextFillColorDisabled}" />
<SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource TextFillColorInverse}" />

<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource AccentTextFillColorPrimary}" />
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource AccentTextFillColorSecondary}" />
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource AccentTextFillColorTertiary}" />
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{ThemeResource SystemAccentColorLight3}" />
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorLight3}" />
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColorLight2}" />
<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource AccentTextFillColorDisabled}" />

<SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />
Expand Down Expand Up @@ -167,9 +161,9 @@
<SolidColorBrush x:Key="AccentFillColorTertiaryBrush" Color="{StaticResource AccentFillColorTertiary}" />
<SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />

<SolidColorBrush x:Key="AccentAAFillColorDefaultBrush" Color="{StaticResource AccentAAFillColorDefault}" />
<SolidColorBrush x:Key="AccentAAFillColorSecondaryBrush" Color="{StaticResource AccentAAFillColorSecondary}" />
<SolidColorBrush x:Key="AccentAAFillColorTertiaryBrush" Color="{StaticResource AccentAAFillColorTertiary}" />
<SolidColorBrush x:Key="AccentAAFillColorDefaultBrush" Color="{ThemeResource SystemAccentColorLight2}" />
<SolidColorBrush x:Key="AccentAAFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorLight3}" />
<SolidColorBrush x:Key="AccentAAFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColorLight1}" />
<SolidColorBrush x:Key="AccentAAFillColorDisabledBrush" Color="{StaticResource AccentAAFillColorDisabled}" />

<SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
Expand Down Expand Up @@ -272,9 +266,6 @@
<Color x:Key="TextFillColorDisabled">#5C000000</Color>
<Color x:Key="TextFillColorInverse">#FFFFFF</Color>

<Color x:Key="AccentTextFillColorPrimary">#003C8B</Color>
<Color x:Key="AccentTextFillColorSecondary">#001E66</Color>
<Color x:Key="AccentTextFillColorTertiary">#005AAF</Color>
<Color x:Key="AccentTextFillColorDisabled">#5C000000</Color>

<Color x:Key="TextOnAccentFillColorPrimary">#FFFFFF</Color>
Expand Down Expand Up @@ -318,9 +309,6 @@
<Color x:Key="AccentFillColorTertiary">#0084D9</Color>
<Color x:Key="AccentFillColorDisabled">#11000000</Color>

<Color x:Key="AccentAAFillColorDefault">#005AAF</Color>
<Color x:Key="AccentAAFillColorSecondary">#003C8B</Color>
<Color x:Key="AccentAAFillColorTertiary">#0078D4</Color>
<Color x:Key="AccentAAFillColorDisabled">#37000000</Color>

<Color x:Key="ControlStrokeColorDefault">#0F000000</Color>
Expand Down Expand Up @@ -376,9 +364,9 @@
<SolidColorBrush x:Key="TextFillColorDisabledBrush" Color="{StaticResource TextFillColorDisabled}" />
<SolidColorBrush x:Key="TextFillColorInverseBrush" Color="{StaticResource TextFillColorInverse}" />

<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{StaticResource AccentTextFillColorPrimary}" />
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{StaticResource AccentTextFillColorSecondary}" />
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{StaticResource AccentTextFillColorTertiary}" />
<SolidColorBrush x:Key="AccentTextFillColorPrimaryBrush" Color="{ThemeResource SystemAccentColorDark2}" />
<SolidColorBrush x:Key="AccentTextFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorDark3}" />
<SolidColorBrush x:Key="AccentTextFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColorDark1}" />
<SolidColorBrush x:Key="AccentTextFillColorDisabledBrush" Color="{StaticResource AccentTextFillColorDisabled}" />

<SolidColorBrush x:Key="TextOnAccentFillColorPrimaryBrush" Color="{StaticResource TextOnAccentFillColorPrimary}" />
Expand Down Expand Up @@ -422,9 +410,9 @@
<SolidColorBrush x:Key="AccentFillColorTertiaryBrush" Color="{StaticResource AccentFillColorTertiary}" />
<SolidColorBrush x:Key="AccentFillColorDisabledBrush" Color="{StaticResource AccentFillColorDisabled}" />

<SolidColorBrush x:Key="AccentAAFillColorDefaultBrush" Color="{StaticResource AccentAAFillColorDefault}" />
<SolidColorBrush x:Key="AccentAAFillColorSecondaryBrush" Color="{StaticResource AccentAAFillColorSecondary}" />
<SolidColorBrush x:Key="AccentAAFillColorTertiaryBrush" Color="{StaticResource AccentAAFillColorTertiary}" />
<SolidColorBrush x:Key="AccentAAFillColorDefaultBrush" Color="{ThemeResource SystemAccentColorDark1}" />
<SolidColorBrush x:Key="AccentAAFillColorSecondaryBrush" Color="{ThemeResource SystemAccentColorDark2}" />
<SolidColorBrush x:Key="AccentAAFillColorTertiaryBrush" Color="{ThemeResource SystemAccentColor}" />
<SolidColorBrush x:Key="AccentAAFillColorDisabledBrush" Color="{StaticResource AccentAAFillColorDisabled}" />

<SolidColorBrush x:Key="ControlStrokeColorDefaultBrush" Color="{StaticResource ControlStrokeColorDefault}" />
Expand Down
Loading