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 DesktopClock/CountdownTargetEditor.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
Padding="10,7">
<StackPanel>
<TextBlock Text="Preview"
FontSize="11"
FontSize="12"
Foreground="{DynamicResource TextSecondaryBrush}"
Margin="0,0,0,2" />
<TextBlock x:Name="PreviewText"
Expand Down
2 changes: 1 addition & 1 deletion DesktopClock/CountdownTargetEditor.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ private void BuildPresetButtons()
var example = new TextBlock
{
Text = getTarget().ToString("ddd, MMM d, h:mm tt"),
FontSize = 11.5,
FontSize = 12,
TextTrimming = TextTrimming.CharacterEllipsis,
};
example.SetResourceReference(ForegroundProperty, "TextSecondaryBrush");
Expand Down
2 changes: 1 addition & 1 deletion DesktopClock/FormatEditor.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
Padding="10,7">
<StackPanel>
<TextBlock Text="Preview"
FontSize="11"
FontSize="12"
Foreground="{DynamicResource TextSecondaryBrush}"
Margin="0,0,0,2" />
<TextBlock x:Name="PreviewText"
Expand Down
2 changes: 1 addition & 1 deletion DesktopClock/FormatEditor.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private void BuildPresetButtons()
var example = new TextBlock
{
Text = FormatPreview(format),
FontSize = 11.5,
FontSize = 12,
TextTrimming = TextTrimming.CharacterEllipsis,
};
example.SetResourceReference(ForegroundProperty, "TextSecondaryBrush");
Expand Down
2 changes: 1 addition & 1 deletion DesktopClock/SettingsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
ResizeMode="CanResize"
WindowStartupLocation="CenterScreen"
FontFamily="Segoe UI Variable Text, Segoe UI"
FontSize="13"
FontSize="14"
UseLayoutRounding="True"
Background="{DynamicResource WindowBackgroundBrush}"
Foreground="{DynamicResource TextPrimaryBrush}"
Expand Down
2 changes: 1 addition & 1 deletion DesktopClock/ThemePresetPicker.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private Button CreatePresetButton(ClockTheme theme)
var name = new TextBlock
{
Text = theme.Name,
FontSize = 11.5,
FontSize = 12,
HorizontalAlignment = HorizontalAlignment.Center,
Margin = new Thickness(0, 4, 0, 0),
};
Expand Down
12 changes: 7 additions & 5 deletions DesktopClock/Themes/FluentTheme.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<Setter Property="Margin" Value="0,0,0,2" />
<Setter Property="Padding" Value="11,7,23,7" />
<Setter Property="MinHeight" Value="34" />
<Setter Property="FontSize" Value="13" />
<Setter Property="FontSize" Value="14" />
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="Template">
Expand Down Expand Up @@ -154,7 +154,7 @@

<Style x:Key="SidebarToolDescription"
TargetType="TextBlock">
<Setter Property="FontSize" Value="11" />
<Setter Property="FontSize" Value="12" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="Foreground" Value="{DynamicResource TextSecondaryBrush}" />
Expand Down Expand Up @@ -632,7 +632,8 @@

<Style x:Key="DescriptionTextBlock"
TargetType="TextBlock">
<Setter Property="FontSize" Value="11.5" />
<!-- Win11 caption size, one step under the 14px body. -->
<Setter Property="FontSize" Value="12" />
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="Foreground" Value="{DynamicResource TextSecondaryBrush}" />
</Style>
Expand Down Expand Up @@ -698,15 +699,16 @@
<Style x:Key="MenuIconGlyph"
TargetType="TextBlock">
<Setter Property="FontFamily" Value="Segoe Fluent Icons, Segoe MDL2 Assets" />
<Setter Property="FontSize" Value="13" />
<Setter Property="FontSize" Value="14" />
<Setter Property="HorizontalAlignment" Value="Center" />
<Setter Property="VerticalAlignment" Value="Center" />
</Style>

<Style TargetType="{x:Type MenuItem}">
<Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" />
<Setter Property="FontSize" Value="12" />
<!-- Win11 flyout menus use body-size text. -->
<Setter Property="FontSize" Value="14" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type MenuItem}">
Expand Down