diff --git a/src/client/spark/core/FontsAndColors/BTSColors.cs b/src/client/spark/core/FontsAndColors/BTSColors.cs index a7e819760..894244e9f 100644 --- a/src/client/spark/core/FontsAndColors/BTSColors.cs +++ b/src/client/spark/core/FontsAndColors/BTSColors.cs @@ -306,8 +306,7 @@ namespace mbts.ui { public static BTSColor grid_line { get { return new BTSColor(64, 0, 0, 0); } } } - public static class UI - { + public static class UI { [DisplayInfo(name = "Shell Background")] public static BTSColor default_background { get { return new BTSColor(0xf6, 0xf6, 0xf6); } } [DisplayInfo(name = "Shell Text")] @@ -324,6 +323,7 @@ namespace mbts.ui { public static BTSColor input_mouseover_background { get { return new BTSColor(0xAB, 0xAD, 0xB3); } } public static BTSColor input_selected_border { get { return new BTSColor(0x7E, 0xB4, 0xEA); } } public static BTSColor input_selected_background { get { return new BTSColor(0xAB, 0xAD, 0xB3); } } + public static BTSColor text_prompt_foreground_color => 0x99999999; public static BTSColor input_disabled_text => new BTSColor(0x87); public static BTSColor input_disabled_text_dark => new BTSColor(0x66); @@ -335,6 +335,9 @@ namespace mbts.ui { public static BTSColor input_dirty_border => warning; + public static Brush text_prompt_foreground_brush { get; } = text_prompt_foreground_color.to_brush().frozen(); + public static Brush input_disabled_text_brush { get; } = input_disabled_text.to_brush().frozen(); + public static class ComboBox { // Normal @@ -645,8 +648,8 @@ namespace mbts.ui { public static Color logo_gray { get { return Color.FromRgb(179, 179, 179); } } public static Brush logo_gray_brush { get { return new SolidColorBrush(logo_gray); } } - public static Color common_background { get { return UI.default_background; } } - public static Brush common_background_brush { get { return new SolidColorBrush(common_background); } } + public static Color common_background => UI.default_background; + public static Brush common_background_brush { get; } = common_background.to_brush().frozen(); public static Color accent1 { get { return UI.accent_light; } } public static Brush accent1_brush { get { return new SolidColorBrush(accent1); } } diff --git a/src/client/spark/view/Colors.xaml b/src/client/spark/view/Colors.xaml index 073ca2704..e990a354c 100644 --- a/src/client/spark/view/Colors.xaml +++ b/src/client/spark/view/Colors.xaml @@ -75,6 +75,4 @@ - - \ No newline at end of file diff --git a/src/client/spark/view/Controls/Time/DateTimePicker.xaml b/src/client/spark/view/Controls/Time/DateTimePicker.xaml index 2b329506d..7aee8f0dd 100644 --- a/src/client/spark/view/Controls/Time/DateTimePicker.xaml +++ b/src/client/spark/view/Controls/Time/DateTimePicker.xaml @@ -66,7 +66,7 @@