|
1 | 1 | <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
2 | 2 | xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
3 | | - xmlns:ui="clr-namespace:GitHub.UI"> |
| 3 | + xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI" |
| 4 | + xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"> |
4 | 5 |
|
5 | 6 | <Style TargetType="{x:Type ui:FilterTextBox}"> |
6 | | - <Setter Property="Background" Value="White"/> |
7 | | - <Setter Property="BorderBrush" Value="#D1D1D1"/> |
8 | | - <Setter Property="Foreground" Value="{DynamicResource GitHubForegroundBrush}"/> |
| 7 | + <Setter Property="Background" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBackgroundBrushKey}}"/> |
| 8 | + <Setter Property="BorderBrush" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderBrushKey}}"/> |
| 9 | + <Setter Property="Foreground" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxTextBrushKey}}"/> |
9 | 10 | <Setter Property="BorderThickness" Value="1"/> |
10 | 11 | <Setter Property="KeyboardNavigation.TabNavigation" Value="None"/> |
11 | 12 | <Setter Property="HorizontalContentAlignment" Value="Left"/> |
|
112 | 113 | <Condition Property="IsEnabled" Value="True" /> |
113 | 114 | </MultiTrigger.Conditions> |
114 | 115 | <MultiTrigger.Setters> |
115 | | - <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubTextBoxMouseOverBorderBrush}" /> |
| 116 | + <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedBrushKey}}" /> |
116 | 117 | <Setter Property="Opacity" TargetName="clearButton" Value="1" /> |
117 | 118 | </MultiTrigger.Setters> |
118 | 119 | </MultiTrigger> |
119 | 120 | <Trigger Property="IsKeyboardFocusWithin" Value="True"> |
120 | | - <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource GitHubAccentBrush}" /> |
| 121 | + <Setter Property="BorderBrush" TargetName="Bd" Value="{DynamicResource {x:Static vs:CommonControlsColors.TextBoxBorderFocusedBrushKey}}" /> |
121 | 122 | </Trigger> |
122 | 123 | <DataTrigger Binding="{Binding Text.Length, RelativeSource={RelativeSource Self}}" Value="0"> |
123 | 124 | <Setter Property="Opacity" TargetName="PromptLabel" Value="0.7" /> |
|
0 commit comments