diff options
| author | sr55 <[email protected]> | 2019-07-06 21:57:00 +0100 |
|---|---|---|
| committer | sr55 <[email protected]> | 2019-07-06 21:57:00 +0100 |
| commit | b040895dd627616f23f67af4021ccefcad7f9486 (patch) | |
| tree | f6b242505da1eed89a67c0b2e1762174fa0102da /win/CS/HandBrakeWPF/Themes/Dark.xaml | |
| parent | cfb4a33b6eb05db67406010299dfb883de9b60ed (diff) | |
WinGui: Further work on the new dark theme.
Diffstat (limited to 'win/CS/HandBrakeWPF/Themes/Dark.xaml')
| -rw-r--r-- | win/CS/HandBrakeWPF/Themes/Dark.xaml | 43 |
1 files changed, 7 insertions, 36 deletions
diff --git a/win/CS/HandBrakeWPF/Themes/Dark.xaml b/win/CS/HandBrakeWPF/Themes/Dark.xaml index 627df5c3c..9eff8ad14 100644 --- a/win/CS/HandBrakeWPF/Themes/Dark.xaml +++ b/win/CS/HandBrakeWPF/Themes/Dark.xaml @@ -10,21 +10,19 @@ <SolidColorBrush x:Key="Ui.Dark" Color="#252525" /> <SolidColorBrush x:Key="Ui.Mid" Color="#363636" /> - <SolidColorBrush x:Key="Ui.Light" Color="#464646" /> <SolidColorBrush x:Key="Ui.Ultralight" Color="#606060" /> + <SolidColorBrush x:Key="Ui.ContrastLight" Color="#C0C0C0" /> + <SolidColorBrush x:Key="Ui.WhiteSmoke" Color="WhiteSmoke" /> <!-- General --> <SolidColorBrush x:Key="{x:Static SystemColors.WindowBrushKey}" Color="#252525" /> <SolidColorBrush x:Key="{x:Static SystemColors.WindowTextBrushKey}" Color="White" /> <SolidColorBrush x:Key="{x:Static SystemColors.ControlTextBrushKey}" Color="White" /> <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}" Color="WhiteSmoke" /> - - <!-- Button --> - <Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}"> - <Setter Property="Background" Value="{DynamicResource Ui.Light}" /> - <Setter Property="Foreground" Value="White" /> - </Style> + <SolidColorBrush x:Key="{x:Static SystemColors.MenuTextBrushKey}" Color="WhiteSmoke" /> + <SolidColorBrush x:Key="{x:Static SystemColors.ControlDarkBrushKey}" Color="WhiteSmoke" /> + <!-- Listbox --> <Style TargetType="ListBox"> @@ -38,35 +36,6 @@ <Setter Property="Foreground" Value="White" /> </Style> - <!-- Menu --> - <Style TargetType="Menu"> - <Setter Property="Background" Value="{DynamicResource Ui.Mid}" /> - <Setter Property="Foreground" Value="White" /> - </Style> - - <Style TargetType="MenuItem"> - <Setter Property="Background" Value="{DynamicResource Ui.Mid}" /> - <Setter Property="Foreground" Value="White" /> - </Style> - - <Style TargetType="{x:Type ContextMenu}"> - <Setter Property="Background" Value="{DynamicResource Ui.Mid}"/> - <Setter Property="Foreground" Value="WhiteSmoke"/> - </Style> - - <Style x:Key="{x:Static MenuItem.SeparatorStyleKey}" TargetType="{x:Type Separator}"> - <Setter Property="FocusVisualStyle" Value="{x:Null}"/> - <Setter Property="Template"> - <Setter.Value> - <ControlTemplate TargetType="{x:Type Separator}"> - <Grid Margin="3,2,3,2" SnapsToDevicePixels="true" UseLayoutRounding="False"> - <Rectangle Fill="WhiteSmoke" Height="1"/> - </Grid> - </ControlTemplate> - </Setter.Value> - </Setter> - </Style> - <!-- StatusBar --> <Style TargetType="StatusBar"> <Setter Property="Background" Value="{DynamicResource Ui.Mid}" /> @@ -127,6 +96,8 @@ <ResourceDictionary.MergedDictionaries> <ResourceDictionary Source="Controls/ComboBoxDark.xaml" /> + <ResourceDictionary Source="Controls/ButtonDark.xaml" /> + <ResourceDictionary Source="Controls/ContextMenuDark.xaml" /> </ResourceDictionary.MergedDictionaries> </ResourceDictionary>
\ No newline at end of file |