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

Visual updates to expander #4024

Merged
merged 10 commits into from
Jan 29, 2021
Merged

Visual updates to expander #4024

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
acda73d
visual updates to expander
tashatitova Jan 26, 2021
f6206f9
Merge branch 'master' into user/tatito/expander
ranjeshj Jan 27, 2021
de8ba8e
merge
tashatitova Jan 27, 2021
6291030
updating ghost to subtle brushes
tashatitova Jan 27, 2021
0048016
Merge branch 'user/tatito/expander' of https://github.com/microsoft/m…
tashatitova Jan 27, 2021
d8227b4
moving styles to expander.xaml
tashatitova Jan 28, 2021
8bed970
figuring out the file folder situation
tashatitova Jan 28, 2021
617cdd9
Merge branch 'master' of https://github.com/microsoft/microsoft-ui-xa…
tashatitova Jan 28, 2021
cd0dd75
moving default style to expander.xaml
tashatitova Jan 28, 2021
6b0468f
more feedback
tashatitova Jan 28, 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
11 changes: 10 additions & 1 deletion dev/CommonStyles/Common_themeresources.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,10 +603,19 @@
<SolidColorBrush x:Key="CircleElevationBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="AccentControlElevationBorderBrush" Color="{ThemeResource SystemColorWindowTextColor}" />

<!-- Other -->
<!-- System high contrast colors -->

<SolidColorBrush x:Key="SystemColorWindowTextColorBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
<SolidColorBrush x:Key="SystemColorWindowColorBrush" Color="{ThemeResource SystemColorWindowColor}" />
<SolidColorBrush x:Key="SystemColorButtonFaceColorBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
<SolidColorBrush x:Key="SystemColorButtonTextColorBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
<SolidColorBrush x:Key="SystemColorHighlightColorBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="SystemColorHighlightTextColorBrush" Color="{ThemeResource SystemColorHighlightTextColor}" />
<SolidColorBrush x:Key="SystemColorHotlightColorBrush" Color="{ThemeResource SystemColorHotlightColor}" />
<SolidColorBrush x:Key="SystemColorGrayTextColorBrush" Color="{ThemeResource SystemColorGrayTextColor}" />

<!-- Other -->

<SolidColorBrush x:Key="SystemControlTransparentBrush" Color="Transparent" />
<SolidColorBrush x:Key="SystemControlHighlightListAccentVeryHighBrush" Color="{ThemeResource SystemColorHighlightColor}" />
<SolidColorBrush x:Key="SystemControlHighlightListAccentMediumLowBrush" Color="{ThemeResource SystemColorHighlightColor}" />
Expand Down
5 changes: 0 additions & 5 deletions dev/Expander/Expander.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)ExpanderAutomationPeer.cpp" />
</ItemGroup>
<ItemGroup>
<Page Include="$(MSBuildThisFileDirectory)Expander.xaml">
<UseVisualStyle>Any</UseVisualStyle>
<Version>RS1</Version>
<Type>DefaultStyle</Type>
</Page>
tashatitova marked this conversation as resolved.
Show resolved Hide resolved
<Page Include="$(MSBuildThisFileDirectory)Expander_themeresources.xaml">
<UseVisualStyle>Latest</UseVisualStyle>
<Version>RS1</Version>
Expand Down
Loading