Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dashboard/Helpers/TabHelpers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public static void ApplyDarkModeToChart(WpfPlot chart)
var darkBackground = ScottPlot.Color.FromHex("#22252b");
var darkerBackground = ScottPlot.Color.FromHex("#111217");
var textColor = ScottPlot.Color.FromHex("#9DA5B4");
var gridColor = ScottPlot.Colors.White.WithAlpha(20);
var gridColor = ScottPlot.Colors.White.WithAlpha(40);

chart.Plot.FigureBackground.Color = darkBackground;
chart.Plot.DataBackground.Color = darkerBackground;
Expand Down
16 changes: 12 additions & 4 deletions Dashboard/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,22 @@
Margin="0,0,0,12"/>
<Separator/>
<Button x:Name="SettingsButton"
Content="Settings"
Click="Settings_Click"
Height="28"
Margin="0,8,0,6"/>
Margin="0,8,0,6">
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE713;" FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
<TextBlock Text="Settings" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<Button x:Name="HelpButton"
Content="Help / About"
Click="Help_Click"
Height="28"/>
Height="28">
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE897;" FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
<TextBlock Text="Help / About" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
</Grid>
</Border>
Expand Down
15 changes: 14 additions & 1 deletion Dashboard/Themes/DarkTheme.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,20 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
<Trigger.EnterActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLighterColor}" Duration="0:0:0.12"/>
</Storyboard>
</BeginStoryboard>
</Trigger.EnterActions>
<Trigger.ExitActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLightColor}" Duration="0:0:0.12"/>
</Storyboard>
</BeginStoryboard>
</Trigger.ExitActions>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
Expand Down
2 changes: 1 addition & 1 deletion Lite/Controls/ServerTab.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,7 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
var darkBackground = ScottPlot.Color.FromHex("#22252b");
var darkerBackground = ScottPlot.Color.FromHex("#111217");
var textColor = ScottPlot.Color.FromHex("#9DA5B4");
var gridColor = ScottPlot.Colors.White.WithAlpha(20);
var gridColor = ScottPlot.Colors.White.WithAlpha(40);

chart.Plot.FigureBackground.Color = darkBackground;
chart.Plot.DataBackground.Color = darkerBackground;
Expand Down
14 changes: 12 additions & 2 deletions Lite/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,18 @@
<StackPanel>
<Button x:Name="AddServerButton" Content="+ Add Server" Click="AddServerButton_Click"/>
<Button x:Name="ManageServersButton" Content="Manage Servers" Click="ManageServersButton_Click" Margin="0,8,0,0"/>
<Button x:Name="SettingsButton" Content="Settings" Click="SettingsButton_Click" Margin="0,8,0,0"/>
<Button Content="About" Click="AboutButton_Click" Margin="0,8,0,0"/>
<Button x:Name="SettingsButton" Click="SettingsButton_Click" Margin="0,8,0,0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE713;" FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
<TextBlock Text="Settings" VerticalAlignment="Center"/>
</StackPanel>
</Button>
<Button Click="AboutButton_Click" Margin="0,8,0,0">
<StackPanel Orientation="Horizontal">
<TextBlock Text="&#xE897;" FontFamily="Segoe MDL2 Assets" FontSize="12" VerticalAlignment="Center" Margin="0,0,6,0"/>
<TextBlock Text="About" VerticalAlignment="Center"/>
</StackPanel>
</Button>
</StackPanel>
</Border>
</Grid>
Expand Down
15 changes: 14 additions & 1 deletion Lite/Themes/DarkTheme.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,20 @@
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter TargetName="border" Property="Background" Value="{StaticResource BackgroundLighterBrush}"/>
<Trigger.EnterActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLighterColor}" Duration="0:0:0.12"/>
</Storyboard>
</BeginStoryboard>
</Trigger.EnterActions>
<Trigger.ExitActions>
<BeginStoryboard>
<Storyboard>
<ColorAnimation Storyboard.TargetName="border" Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" To="{StaticResource BackgroundLightColor}" Duration="0:0:0.12"/>
</Storyboard>
</BeginStoryboard>
</Trigger.ExitActions>
</Trigger>
<Trigger Property="IsPressed" Value="True">
<Setter TargetName="border" Property="Background" Value="{StaticResource AccentPressedBrush}"/>
Expand Down
2 changes: 1 addition & 1 deletion Lite/Windows/ProcedureHistoryWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
var darkBg = ScottPlot.Color.FromHex("#22252b");
var darkerBg = ScottPlot.Color.FromHex("#111217");
var text = ScottPlot.Color.FromHex("#9DA5B4");
var grid = ScottPlot.Colors.White.WithAlpha(20);
var grid = ScottPlot.Colors.White.WithAlpha(40);

chart.Plot.FigureBackground.Color = darkBg;
chart.Plot.DataBackground.Color = darkerBg;
Expand Down
2 changes: 1 addition & 1 deletion Lite/Windows/QueryStatsHistoryWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
var darkBg = ScottPlot.Color.FromHex("#22252b");
var darkerBg = ScottPlot.Color.FromHex("#111217");
var text = ScottPlot.Color.FromHex("#9DA5B4");
var grid = ScottPlot.Colors.White.WithAlpha(20);
var grid = ScottPlot.Colors.White.WithAlpha(40);

chart.Plot.FigureBackground.Color = darkBg;
chart.Plot.DataBackground.Color = darkerBg;
Expand Down
2 changes: 1 addition & 1 deletion Lite/Windows/QueryStoreHistoryWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private static void ApplyDarkTheme(ScottPlot.WPF.WpfPlot chart)
var darkBg = ScottPlot.Color.FromHex("#22252b");
var darkerBg = ScottPlot.Color.FromHex("#111217");
var text = ScottPlot.Color.FromHex("#9DA5B4");
var grid = ScottPlot.Colors.White.WithAlpha(20);
var grid = ScottPlot.Colors.White.WithAlpha(40);

chart.Plot.FigureBackground.Color = darkBg;
chart.Plot.DataBackground.Color = darkerBg;
Expand Down