Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 01a5a5b

Browse files
StanleyGoldmanStanleyGoldman
committed
Including missing themes
1 parent 995321b commit 01a5a5b

File tree

4 files changed

+169
-13
lines changed

4 files changed

+169
-13
lines changed

‎src/GitHub.UI/Assets/Controls/AutoCompleteBox.xaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@
6565
<Setter Property="Padding" Value="5,0,10,0"/>
6666
<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
6767
<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
68-
<Setter Property="Background" Value="{StaticResource GHBoxBackgroundBrush}"/>
69-
<Setter Property="Foreground" Value="{StaticResource GHBoxTextBrush}"/>
68+
<Setter Property="Background" Value="{DynamicResource GHBoxBackgroundBrush}"/>
69+
<Setter Property="Foreground" Value="{DynamicResource GHBoxTextBrush}"/>
7070
<Setter Property="BorderBrush" Value="Transparent"/>
7171
<Setter Property="BorderThickness" Value="0"/>
72-
<Setter Property="FocusVisualStyle" Value="{StaticResource NoMarginFocusVisual}"/>
72+
<Setter Property="FocusVisualStyle" Value="{DynamicResource NoMarginFocusVisual}"/>
7373
<Setter Property="Template">
7474
<Setter.Value>
7575
<ControlTemplate TargetType="{x:Type ListBoxItem}">
@@ -81,23 +81,23 @@
8181
<MultiTrigger.Conditions>
8282
<Condition Property="IsMouseOver" Value="True"/>
8383
</MultiTrigger.Conditions>
84-
<Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource GHBoxHoverBackgroundBrush}"/>
84+
<Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GHBoxHoverBackgroundBrush}"/>
8585
</MultiTrigger>
8686
<MultiTrigger>
8787
<MultiTrigger.Conditions>
8888
<Condition Property="Selector.IsSelectionActive" Value="False"/>
8989
<Condition Property="IsSelected" Value="True"/>
9090
</MultiTrigger.Conditions>
91-
<Setter Property="Background" Value="{StaticResource GHBoxSelectedBackgroundBrush}"/>
92-
<Setter Property="Foreground" Value="{StaticResource GHBoxSelectedTextBrush}"/>
91+
<Setter Property="Background" Value="{DynamicResource GHBoxSelectedBackgroundBrush}"/>
92+
<Setter Property="Foreground" Value="{DynamicResource GHBoxSelectedTextBrush}"/>
9393
</MultiTrigger>
9494
<MultiTrigger>
9595
<MultiTrigger.Conditions>
9696
<Condition Property="Selector.IsSelectionActive" Value="True"/>
9797
<Condition Property="IsSelected" Value="True"/>
9898
</MultiTrigger.Conditions>
99-
<Setter Property="Background" Value="{StaticResource GHBoxActiveSelectionBackgroundBrush}"/>
100-
<Setter Property="Foreground" Value="{StaticResource GHBoxActiveSelectionTextBrush}"/>
99+
<Setter Property="Background" Value="{DynamicResource GHBoxActiveSelectionBackgroundBrush}"/>
100+
<Setter Property="Foreground" Value="{DynamicResource GHBoxActiveSelectionTextBrush}"/>
101101
</MultiTrigger>
102102
<Trigger Property="IsEnabled" Value="False">
103103
<Setter Property="Opacity" TargetName="Bd" Value="0.3"/>
@@ -113,8 +113,8 @@
113113
<Style TargetType="ui:AutoCompleteBox">
114114
<Setter Property="IsTabStop" Value="False" />
115115
<Setter Property="Padding" Value="2" />
116-
<Setter Property="Background" Value="{StaticResource DefaultBackgroundBrush}" />
117-
<Setter Property="Foreground" Value="{StaticResource GHTextBrush}" />
116+
<Setter Property="Background" Value="{DynamicResource DefaultBackgroundBrush}" />
117+
<Setter Property="Foreground" Value="{DynamicResource GHTextBrush}" />
118118
<Setter Property="MinWidth" Value="45" />
119119
<Setter Property="ItemContainerStyle" Value="{StaticResource AutoCompleteListItemContainerStyle}" />
120120

‎src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,57 @@
6767
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB" />
6868
<SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FFD6DBE9" />
6969

70-
<SolidColorBrush x:Key="GitHubTimelineEventBackgroundBrush" Color="#FFe1e4e8" />
70+
<SolidColorBrush x:Key="GitHubTimelineEventBackgroundBrush" Color="#FFe1e4e8" />
71+
72+
<!-- Not selected, nor focused -->
73+
<Color x:Key="GHBoxTextColor">#333333</Color>
74+
<SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
75+
PresentationOptions:Freeze="true" />
76+
77+
<Color x:Key="GHBoxIconColor">#b7b7b7</Color>
78+
<SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
79+
PresentationOptions:Freeze="true" />
80+
81+
<Color x:Key="GHBoxBackgroundColor">Transparent</Color>
82+
<SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
83+
PresentationOptions:Freeze="true" />
84+
85+
<!-- Selected, not active (focused) -->
86+
<Color x:Key="GHBoxSelectedTextColor">#333333</Color>
87+
<SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
88+
PresentationOptions:Freeze="true" />
89+
90+
<Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
91+
<SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
92+
PresentationOptions:Freeze="true" />
93+
94+
<Color x:Key="GHBoxSelectedBackgroundColor">#e7e7e7</Color>
95+
<SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
96+
PresentationOptions:Freeze="true" />
97+
98+
<!-- Selected and active (focused) -->
99+
<Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
100+
<SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
101+
PresentationOptions:Freeze="true" />
102+
103+
<Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
104+
<SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
105+
PresentationOptions:Freeze="true" />
106+
107+
<Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
108+
<SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
109+
PresentationOptions:Freeze="true" />
110+
111+
<!-- Hovered (should never be used for selected or active items) -->
112+
<Color x:Key="GHBoxHoverTextColor">#0a0a0a</Color>
113+
<SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
114+
PresentationOptions:Freeze="true" />
115+
116+
<Color x:Key="GHBoxHoverIconColor">#909090</Color>
117+
<SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
118+
PresentationOptions:Freeze="true" />
119+
120+
<Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
121+
<SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
122+
PresentationOptions:Freeze="true" />
71123
</ResourceDictionary>

‎src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,57 @@
6767
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FF3F3F46"/>
6868
<SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FF2D2D30" />
6969

70-
<SolidColorBrush x:Key="GitHubTimelineEventBackgroundBrush" Color="#FF4b4d50" />
70+
<SolidColorBrush x:Key="GitHubTimelineEventBackgroundBrush" Color="#FF4b4d50" />
71+
72+
<!-- Not selected, nor focused -->
73+
<Color x:Key="GHBoxTextColor">#cccccc</Color>
74+
<SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
75+
PresentationOptions:Freeze="true" />
76+
77+
<Color x:Key="GHBoxIconColor">#b7b7b7</Color>
78+
<SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
79+
PresentationOptions:Freeze="true" />
80+
81+
<Color x:Key="GHBoxBackgroundColor">Transparent</Color>
82+
<SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
83+
PresentationOptions:Freeze="true" />
84+
85+
<!-- Selected, not active (focused) -->
86+
<Color x:Key="GHBoxSelectedTextColor">#cccccc</Color>
87+
<SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
88+
PresentationOptions:Freeze="true" />
89+
90+
<Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
91+
<SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
92+
PresentationOptions:Freeze="true" />
93+
94+
<Color x:Key="GHBoxSelectedBackgroundColor">#3e3e3e</Color>
95+
<SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
96+
PresentationOptions:Freeze="true" />
97+
98+
<!-- Selected and active (focused) -->
99+
<Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
100+
<SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
101+
PresentationOptions:Freeze="true" />
102+
103+
<Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
104+
<SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
105+
PresentationOptions:Freeze="true" />
106+
107+
<Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
108+
<SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
109+
PresentationOptions:Freeze="true" />
110+
111+
<!-- Hovered (should never be used for selected or active items) -->
112+
<Color x:Key="GHBoxHoverTextColor">#ffffff</Color>
113+
<SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
114+
PresentationOptions:Freeze="true" />
115+
116+
<Color x:Key="GHBoxHoverIconColor">#ffffff</Color>
117+
<SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
118+
PresentationOptions:Freeze="true" />
119+
120+
<Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
121+
<SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
122+
PresentationOptions:Freeze="true" />
71123
</ResourceDictionary>

‎src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,57 @@
6767
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB"/>
6868
<SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FFEEEEF2" />
6969

70-
<SolidColorBrush x:Key="GitHubTimelineEventBackgroundBrush" Color="#FFe1e4e8" />
70+
<SolidColorBrush x:Key="GitHubTimelineEventBackgroundBrush" Color="#FFe1e4e8" />
71+
72+
<!-- Not selected, nor focused -->
73+
<Color x:Key="GHBoxTextColor">#333333</Color>
74+
<SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
75+
PresentationOptions:Freeze="true" />
76+
77+
<Color x:Key="GHBoxIconColor">#b7b7b7</Color>
78+
<SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
79+
PresentationOptions:Freeze="true" />
80+
81+
<Color x:Key="GHBoxBackgroundColor">Transparent</Color>
82+
<SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
83+
PresentationOptions:Freeze="true" />
84+
85+
<!-- Selected, not active (focused) -->
86+
<Color x:Key="GHBoxSelectedTextColor">#333333</Color>
87+
<SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
88+
PresentationOptions:Freeze="true" />
89+
90+
<Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
91+
<SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
92+
PresentationOptions:Freeze="true" />
93+
94+
<Color x:Key="GHBoxSelectedBackgroundColor">#e7e7e7</Color>
95+
<SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
96+
PresentationOptions:Freeze="true" />
97+
98+
<!-- Selected and active (focused) -->
99+
<Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
100+
<SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
101+
PresentationOptions:Freeze="true" />
102+
103+
<Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
104+
<SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
105+
PresentationOptions:Freeze="true" />
106+
107+
<Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
108+
<SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
109+
PresentationOptions:Freeze="true" />
110+
111+
<!-- Hovered (should never be used for selected or active items) -->
112+
<Color x:Key="GHBoxHoverTextColor">#0a0a0a</Color>
113+
<SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
114+
PresentationOptions:Freeze="true" />
115+
116+
<Color x:Key="GHBoxHoverIconColor">#909090</Color>
117+
<SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
118+
PresentationOptions:Freeze="true" />
119+
120+
<Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
121+
<SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
122+
PresentationOptions:Freeze="true" />
71123
</ResourceDictionary>

0 commit comments

Comments
 (0)