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

Add MicaBaseAlt Fallback Brushes #6825

Merged
merged 3 commits into from
Mar 28, 2022
Merged

Add MicaBaseAlt Fallback Brushes #6825

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5dd49e1
add micabasealt fallback brushes
karkarl Mar 14, 2022
1ea41d5
update brush names
karkarl Mar 18, 2022
cb6a607
changes from comments
karkarl Mar 18, 2022
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
14 changes: 10 additions & 4 deletions dev/CommonStyles/Common_themeresources_any.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<Color x:Key="LayerFillColorAlt">#0DFFFFFF</Color>
<Color x:Key="LayerOnAcrylicFillColorDefault">#09FFFFFF</Color>
<Color x:Key="LayerOnAccentAcrylicFillColorDefault">#09FFFFFF</Color>

karkarl marked this conversation as resolved.
Show resolved Hide resolved
<Color x:Key="LayerOnMicaBaseAltFillColorDefault">#733A3A3A</Color>
<Color x:Key="LayerOnMicaBaseAltFillColorSecondary">#0FFFFFFF</Color>
<Color x:Key="LayerOnMicaBaseAltFillColorTertiary">#2C2C2C</Color>
Expand All @@ -96,6 +96,7 @@
<Color x:Key="SolidBackgroundFillColorTertiary">#282828</Color>
<Color x:Key="SolidBackgroundFillColorQuarternary">#2C2C2C</Color>
<Color x:Key="SolidBackgroundFillColorTransparent">#00202020</Color>
<Color x:Key="SolidBackgroundFillColorBaseAlt">#0A0A0A</Color>

<Color x:Key="SystemFillColorSuccess">#6CCB5F</Color>
<Color x:Key="SystemFillColorCaution">#FCE100</Color>
Expand Down Expand Up @@ -197,7 +198,7 @@
<SolidColorBrush x:Key="LayerFillColorAltBrush" Color="{StaticResource LayerFillColorAlt}" />
<SolidColorBrush x:Key="LayerOnAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAcrylicFillColorDefault}" />
<SolidColorBrush x:Key="LayerOnAccentAcrylicFillColorDefaultBrush" Color="{StaticResource LayerOnAccentAcrylicFillColorDefault}" />

karkarl marked this conversation as resolved.
Show resolved Hide resolved
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorDefaultBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorDefault}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorSecondaryBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorSecondary}" />
<SolidColorBrush x:Key="LayerOnMicaBaseAltFillColorTertiaryBrush" Color="{StaticResource LayerOnMicaBaseAltFillColorTertiary}" />
Expand All @@ -207,7 +208,8 @@
<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SolidBackgroundFillColorQuarternary}" />

<SolidColorBrush x:Key="SolidBackgroundFillColorBaseAltBrush" Color="{StaticResource SolidBackgroundFillColorBaseAlt}" />

<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{ThemeResource SystemAccentColorLight2}" />
<SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{StaticResource SystemFillColorSuccess}" />
<SolidColorBrush x:Key="SystemFillColorCautionBrush" Color="{StaticResource SystemFillColorCaution}" />
Expand Down Expand Up @@ -340,7 +342,7 @@
<Color x:Key="LayerFillColorAlt">#FFFFFF</Color>
<Color x:Key="LayerOnAcrylicFillColorDefault">#40FFFFFF</Color>
<Color x:Key="LayerOnAccentAcrylicFillColorDefault">#40FFFFFF</Color>

karkarl marked this conversation as resolved.
Show resolved Hide resolved
<Color x:Key="LayerOnMicaBaseAltFillColorDefault">#B3FFFFFF</Color>
<Color x:Key="LayerOnMicaBaseAltFillColorSecondary">#0A000000</Color>
<Color x:Key="LayerOnMicaBaseAltFillColorTertiary">#F9F9F9</Color>
Expand All @@ -351,6 +353,7 @@
<Color x:Key="SolidBackgroundFillColorTertiary">#F9F9F9</Color>
<Color x:Key="SolidBackgroundFillColorQuarternary">#FFFFFF</Color>
<Color x:Key="SolidBackgroundFillColorTransparent">#00F3F3F3</Color>
<Color x:Key="SolidBackgroundFillColorBaseAlt">#DADADA</Color>

<Color x:Key="SystemFillColorSuccess">#0F7B0F</Color>
<Color x:Key="SystemFillColorCaution">#9D5D00</Color>
Expand Down Expand Up @@ -462,6 +465,7 @@
<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{StaticResource SolidBackgroundFillColorSecondary}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{StaticResource SolidBackgroundFillColorTertiary}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{StaticResource SolidBackgroundFillColorQuarternary}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorBaseAltBrush" Color="{StaticResource SolidBackgroundFillColorBaseAlt}" />

<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{ThemeResource SystemAccentColor}" />
<SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{StaticResource SystemFillColorSuccess}" />
Expand Down Expand Up @@ -613,6 +617,7 @@
<SolidColorBrush x:Key="SolidBackgroundFillColorSecondaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorTertiaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorQuarternaryBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SolidBackgroundFillColorBaseAltBrush" Color="{ThemeResource SystemColorWindowColor}" />

<SolidColorBrush x:Key="SystemFillColorAttentionBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="SystemFillColorSuccessBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
Expand Down Expand Up @@ -700,6 +705,7 @@
<Color x:Key="SolidBackgroundFillColorTertiary">#FF0000</Color>
<Color x:Key="SolidBackgroundFillColorQuarternary">#FF0000</Color>
<Color x:Key="SolidBackgroundFillColorTransparent">#FF0000</Color>
<Color x:Key="SolidBackgroundFillColorBaseAlt">#FF0000</Color>
<Color x:Key="SystemFillColorSuccess">#FF0000</Color>
<Color x:Key="SystemFillColorCaution">#FF0000</Color>
<Color x:Key="SystemFillColorCritical">#FF0000</Color>
Expand Down