Skip to content

Fluent Design Theme #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielchalmers merged 7 commits into from
May 22, 2026
Merged

Fluent Design Theme #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b5920c
First redesign
danielchalmers May 17, 2026
d483c30
more windows 11 style
danielchalmers May 17, 2026
efb418c
Revert "more windows 11 style"
danielchalmers May 17, 2026
f48884c
Revert "First redesign"
danielchalmers May 17, 2026
ce7a0d5
third version (fluent design)
danielchalmers May 18, 2026
c609b26
Revert "third version (fluent design)"
danielchalmers May 22, 2026
a1b9878
opus 4.6
danielchalmers May 22, 2026
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
10 changes: 8 additions & 2 deletions DesktopClock/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<Application x:Class="DesktopClock.App"
<Application x:Class="DesktopClock.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml">
<Application.Resources />
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="Themes/FluentTheme.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>
119 changes: 10 additions & 109 deletions DesktopClock/SettingsWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Window x:Class="DesktopClock.SettingsWindow"
<Window x:Class="DesktopClock.SettingsWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand All @@ -13,110 +13,11 @@
MinWidth="800"
MinHeight="600"
ResizeMode="CanResize"
WindowStartupLocation="CenterScreen">
<Window.Resources>
<Style TargetType="Button">
<Setter Property="Padding" Value="8,4" />
<Setter Property="MinHeight" Value="28" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Margin" Value="0,0,0,4" />
</Style>

<Style x:Key="SidebarButton"
TargetType="Button"
BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="HorizontalContentAlignment" Value="Left" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
<Setter Property="Margin" Value="0,0,0,2" />
<Setter Property="Padding" Value="8,6,24,6" />
<Setter Property="MinHeight" Value="32" />
</Style>

<Style x:Key="SidebarToolButton"
TargetType="Button"
BasedOn="{StaticResource SidebarButton}">
<Setter Property="Background" Value="#FFFFFF" />
<Setter Property="BorderBrush" Value="#DADDE3" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Padding" Value="8,4,20,4" />
<Setter Property="MinWidth" Value="150" />
<Setter Property="MinHeight" Value="0" />
<Setter Property="Margin" Value="0,0,0,4" />
</Style>

<Style x:Key="SidebarToolDescription"
TargetType="TextBlock">
<Setter Property="FontSize" Value="11" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="Opacity" Value="0.75" />
<Setter Property="Margin" Value="0,2,0,0" />
</Style>

<Style x:Key="ColorSwatchButton"
TargetType="Button"
BasedOn="{StaticResource {x:Type Button}}">
<Setter Property="Width" Value="32" />
<Setter Property="Padding" Value="0" />
</Style>

<Style TargetType="TextBox">
<Setter Property="MinHeight" Value="26" />
<Setter Property="Padding" Value="2" />
<Setter Property="VerticalContentAlignment" Value="Center" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="Margin" Value="0,0,0,4" />
</Style>

<Style TargetType="ComboBox">
<Setter Property="MinHeight" Value="26" />
<Setter Property="Padding" Value="6,4" />
<Setter Property="BorderBrush" Value="#D0D0D0" />
<Setter Property="Margin" Value="0,0,0,4" />
</Style>

<Style TargetType="CheckBox">
<Setter Property="Margin" Value="0,0,0,4" />
</Style>

<Style TargetType="Slider">
<Setter Property="Margin" Value="0,0,0,4" />
</Style>

<Style x:Key="CardGroupBox"
TargetType="GroupBox">
<Setter Property="Margin" Value="0,0,0,16" />
<Setter Property="Focusable" Value="True" />
</Style>

<Style x:Key="CardBodyPanel"
TargetType="StackPanel">
<Setter Property="Margin" Value="8" />
</Style>

<Style x:Key="LabelTextBlock"
TargetType="TextBlock">
<Setter Property="FontWeight" Value="SemiBold" />
<Setter Property="Margin" Value="0,0,0,4" />
</Style>

<Style x:Key="DescriptionTextBlock"
TargetType="TextBlock">
<Setter Property="FontSize" Value="11" />
<Setter Property="TextWrapping" Value="Wrap" />
</Style>

<Style x:Key="SliderValueTextBlock"
TargetType="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="HorizontalAlignment" Value="Right" />
</Style>

<Style TargetType="Hyperlink">
<Setter Property="TextDecorations" Value="None" />
</Style>
</Window.Resources>
WindowStartupLocation="CenterScreen"
FontFamily="Segoe UI Variable Text, Segoe UI"
FontSize="13"
UseLayoutRounding="True">


<Grid>
<Grid.ColumnDefinitions>
Expand All @@ -125,8 +26,8 @@
</Grid.ColumnDefinitions>

<Border Grid.Column="0"
Background="#FAFAFA"
BorderBrush="#E1E4E8"
Background="{DynamicResource SubtleBrush}"
BorderBrush="{DynamicResource SeparatorBrush}"
BorderThickness="0,0,1,0">
<Grid Margin="8">
<Grid.RowDefinitions>
Expand All @@ -141,7 +42,7 @@
FontSize="20"
FontWeight="SemiBold" />
<TextBlock Text="{Binding AppVersion, StringFormat=v{0}}"
Foreground="#5B6F8E"
Foreground="{DynamicResource TextSecondaryBrush}"
Margin="0,0,0,6" />
</StackPanel>

Expand Down Expand Up @@ -227,7 +128,7 @@
ScrollChanged="SettingsScrollViewer_ScrollChanged"
Loaded="SettingsScrollViewer_Loaded">
<StackPanel x:Name="SettingsContent"
Margin="16,16,16,0">
Margin="24,24,24,0">
<GroupBox x:Name="DisplaySection"
Header="Display"
Style="{StaticResource CardGroupBox}">
Expand Down
Loading
Loading