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

Commit 9d2ee84

Browse files
StanleyGoldmanStanleyGoldman
committed
Including missing themes
1 parent 3ff1300 commit 9d2ee84

File tree

4 files changed

+166
-10
lines changed

4 files changed

+166
-10
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: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,56 @@
6666
<SolidColorBrush x:Key="GitHubPendingReviewBackground" Color="#FFF8C7" />
6767
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB" />
6868
<SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FFD6DBE9" />
69+
70+
<!-- Not selected, nor focused -->
71+
<Color x:Key="GHBoxTextColor">#333333</Color>
72+
<SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
73+
PresentationOptions:Freeze="true" />
74+
75+
<Color x:Key="GHBoxIconColor">#b7b7b7</Color>
76+
<SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
77+
PresentationOptions:Freeze="true" />
78+
79+
<Color x:Key="GHBoxBackgroundColor">Transparent</Color>
80+
<SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
81+
PresentationOptions:Freeze="true" />
82+
83+
<!-- Selected, not active (focused) -->
84+
<Color x:Key="GHBoxSelectedTextColor">#333333</Color>
85+
<SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
86+
PresentationOptions:Freeze="true" />
87+
88+
<Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
89+
<SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
90+
PresentationOptions:Freeze="true" />
91+
92+
<Color x:Key="GHBoxSelectedBackgroundColor">#e7e7e7</Color>
93+
<SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
94+
PresentationOptions:Freeze="true" />
95+
96+
<!-- Selected and active (focused) -->
97+
<Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
98+
<SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
99+
PresentationOptions:Freeze="true" />
100+
101+
<Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
102+
<SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
103+
PresentationOptions:Freeze="true" />
104+
105+
<Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
106+
<SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
107+
PresentationOptions:Freeze="true" />
108+
109+
<!-- Hovered (should never be used for selected or active items) -->
110+
<Color x:Key="GHBoxHoverTextColor">#0a0a0a</Color>
111+
<SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
112+
PresentationOptions:Freeze="true" />
113+
114+
<Color x:Key="GHBoxHoverIconColor">#909090</Color>
115+
<SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
116+
PresentationOptions:Freeze="true" />
117+
118+
<Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
119+
<SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
120+
PresentationOptions:Freeze="true" />
69121
</ResourceDictionary>

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,56 @@
6666
<SolidColorBrush x:Key="GitHubPendingReviewBackground" Color="#26384D" />
6767
<SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FF3F3F46"/>
6868
<SolidColorBrush x:Key="GitHubFileExpanderHeaderBackgroundBrush" Color="#FF2D2D30" />
69+
70+
<!-- Not selected, nor focused -->
71+
<Color x:Key="GHBoxTextColor">#cccccc</Color>
72+
<SolidColorBrush x:Key="GHBoxTextBrush" Color="{StaticResource GHBoxTextColor}"
73+
PresentationOptions:Freeze="true" />
74+
75+
<Color x:Key="GHBoxIconColor">#b7b7b7</Color>
76+
<SolidColorBrush x:Key="GHBoxIconBrush" Color="{StaticResource GHBoxIconColor}"
77+
PresentationOptions:Freeze="true" />
78+
79+
<Color x:Key="GHBoxBackgroundColor">Transparent</Color>
80+
<SolidColorBrush x:Key="GHBoxBackgroundBrush" Color="{StaticResource GHBoxBackgroundColor}"
81+
PresentationOptions:Freeze="true" />
82+
83+
<!-- Selected, not active (focused) -->
84+
<Color x:Key="GHBoxSelectedTextColor">#cccccc</Color>
85+
<SolidColorBrush x:Key="GHBoxSelectedTextBrush" Color="{StaticResource GHBoxSelectedTextColor}"
86+
PresentationOptions:Freeze="true" />
87+
88+
<Color x:Key="GHBoxSelectedIconColor">#b7b7b7</Color>
89+
<SolidColorBrush x:Key="GHBoxSelectedIconBrush" Color="{StaticResource GHBoxSelectedIconColor}"
90+
PresentationOptions:Freeze="true" />
91+
92+
<Color x:Key="GHBoxSelectedBackgroundColor">#3e3e3e</Color>
93+
<SolidColorBrush x:Key="GHBoxSelectedBackgroundBrush" Color="{StaticResource GHBoxSelectedBackgroundColor}"
94+
PresentationOptions:Freeze="true" />
95+
96+
<!-- Selected and active (focused) -->
97+
<Color x:Key="GHBoxActiveSelectionTextColor">#ffffff</Color>
98+
<SolidColorBrush x:Key="GHBoxActiveSelectionTextBrush" Color="{StaticResource GHBoxActiveSelectionTextColor}"
99+
PresentationOptions:Freeze="true" />
100+
101+
<Color x:Key="GHBoxActiveSelectionIconColor">#ffffff</Color>
102+
<SolidColorBrush x:Key="GHBoxActiveSelectionIconBrush" Color="{StaticResource GHBoxActiveSelectionIconColor}"
103+
PresentationOptions:Freeze="true" />
104+
105+
<Color x:Key="GHBoxActiveSelectionBackgroundColor">#3998d6</Color>
106+
<SolidColorBrush x:Key="GHBoxActiveSelectionBackgroundBrush" Color="{StaticResource GHBoxActiveSelectionBackgroundColor}"
107+
PresentationOptions:Freeze="true" />
108+
109+
<!-- Hovered (should never be used for selected or active items) -->
110+
<Color x:Key="GHBoxHoverTextColor">#ffffff</Color>
111+
<SolidColorBrush x:Key="GHBoxHoverTextBrush" Color="{StaticResource GHBoxHoverTextColor}"
112+
PresentationOptions:Freeze="true" />
113+
114+
<Color x:Key="GHBoxHoverIconColor">#ffffff</Color>
115+
<SolidColorBrush x:Key="GHBoxHoverIconBrush" Color="{StaticResource GHBoxHoverIconColor}"
116+
PresentationOptions:Freeze="true" />
117+
118+
<Color x:Key="GHBoxHoverBackgroundColor">Transparent</Color>
119+
<SolidColorBrush x:Key="GHBoxHoverBackgroundBrush" Color="{StaticResource GHBoxHoverBackgroundColor}"
120+
PresentationOptions:Freeze="true" />
69121
</ResourceDictionary>

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

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

0 commit comments

Comments
 (0)