From d172f4ffab0e5437b9bc85cd2dc5850901eda1b1 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Thu, 8 Dec 2022 11:43:37 -0500 Subject: [PATCH] ui: Touch up grid settings dialogs (dark theme) --- .../spark/core/FontsAndColors/BTSColors.cs | 1 + .../ColorPickerPopupWithOpacitySlider.xaml | 20 +++--- .../DIYGrid/Settings/GridSettingsView.xaml | 11 ++-- .../Shell/Settings/ShellSettingsDialog.xaml | 61 ++++++++++++++----- 4 files changed, 67 insertions(+), 26 deletions(-) diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index 7a011a7b7..9df8881b9 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -441,6 +441,7 @@ namespace mbts.ui { public static BTSColor default_text => 0xffdddded; public static BTSColor default_foreground => 0xffdddded; public static BTSColor default_foreground_dark => 0xffa4a4a4; + public static BTSColor disabled_text => 0xff666666; public static BTSColor icon_foreground => 0xffa4a4a4; public static BTSColor alternate_text => BTSCoreColors.white; public static BTSColor foreground_standout => Core.turquoise; diff --git a/src/client/spark/view/Controls/ColorPicker/ColorPickerPopupWithOpacitySlider.xaml b/src/client/spark/view/Controls/ColorPicker/ColorPickerPopupWithOpacitySlider.xaml index fe49af51c..b640325d0 100644 --- a/src/client/spark/view/Controls/ColorPicker/ColorPickerPopupWithOpacitySlider.xaml +++ b/src/client/spark/view/Controls/ColorPicker/ColorPickerPopupWithOpacitySlider.xaml @@ -7,12 +7,18 @@ xmlns:c="clr-namespace:mbts.ui.controls" xmlns:cv="clr-namespace:mbts.ui.converters" > - - - - - - + + + + + + + + + + + + diff --git a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml index b5958bf91..5d3f3c946 100644 --- a/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml +++ b/src/client/spark/view/Controls/DIYGrid/Settings/GridSettingsView.xaml @@ -1,4 +1,4 @@ - - Header + - Width + - Horizontal Alignment + -