Skip to content

Commit ea532a3

Browse files
committed
Add Theme Info
1 parent ebe824b commit ea532a3

File tree

7 files changed

+49
-25
lines changed

7 files changed

+49
-25
lines changed

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@
466466
<Grid
467467
Width="Auto"
468468
Height="34"
469-
MinWidth="140"
470469
Margin="0">
471470
<StackPanel Margin="12 0" Orientation="Horizontal">
472471
<TextBlock
@@ -487,7 +486,7 @@
487486
<ui:FontIcon
488487
Margin="8 0 0 0"
489488
VerticalAlignment="Center"
490-
FontSize="8"
489+
FontSize="12"
491490
Glyph="&#xEB42;"
492491
Visibility="{Binding IsBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
493492
</StackPanel>

Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<ResourceDictionary
1+
<!--
2+
Name: Blur Black Darker
3+
IsDark: False
4+
IsBlur: True
5+
-->
6+
<ResourceDictionary
27
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
38
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
49
xmlns:system="clr-namespace:System;assembly=mscorlib">
@@ -53,7 +58,7 @@
5358
TargetType="{x:Type Rectangle}">
5459
<Setter Property="Fill" Value="#444444" />
5560
<Setter Property="Height" Value="1" />
56-
<Setter Property="Margin" Value="12,0,12,8" />
61+
<Setter Property="Margin" Value="12 0 12 8" />
5762
</Style>
5863

5964
<Style

Flow.Launcher/Themes/BlurBlack.xaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<ResourceDictionary
1+
<!--
2+
Name: Blur Black
3+
IsDark: False
4+
IsBlur: True
5+
-->
6+
<ResourceDictionary
27
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
38
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
49
xmlns:system="clr-namespace:System;assembly=mscorlib">
@@ -51,7 +56,7 @@
5156
TargetType="{x:Type Rectangle}">
5257
<Setter Property="Fill" Value="#444444" />
5358
<Setter Property="Height" Value="1" />
54-
<Setter Property="Margin" Value="12,0,12,8" />
59+
<Setter Property="Margin" Value="12 0 12 8" />
5560
</Style>
5661

5762
<Style

Flow.Launcher/Themes/BlurWhite.xaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
<ResourceDictionary
1+
<!--
2+
Name: Blur White
3+
IsDark: False
4+
IsBlur: True
5+
-->
6+
<ResourceDictionary
27
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
38
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
49
xmlns:system="clr-namespace:System;assembly=mscorlib">
@@ -96,7 +101,7 @@
96101
TargetType="{x:Type Rectangle}">
97102
<Setter Property="Fill" Value="#c6c6c6" />
98103
<Setter Property="Height" Value="1" />
99-
<Setter Property="Margin" Value="12,0,12,8" />
104+
<Setter Property="Margin" Value="12 0 12 8" />
100105
</Style>
101106
<!-- button style in the middle of the scrollbar -->
102107
<Style

Flow.Launcher/Themes/Circle System.xaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<!--
2+
Name: Circle
3+
IsDark: True
4+
IsBlur: False
5+
-->
16
<ResourceDictionary
27
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
38
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -17,7 +22,7 @@
1722
x:Key="QueryBoxStyle"
1823
BasedOn="{StaticResource BaseQueryBoxStyle}"
1924
TargetType="{x:Type TextBox}">
20-
<Setter Property="Padding" Value="0,4,50,0" />
25+
<Setter Property="Padding" Value="0 4 50 0" />
2126
<Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
2227
<Setter Property="FontSize" Value="18" />
2328
<Setter Property="Height" Value="38" />
@@ -27,7 +32,7 @@
2732
x:Key="QuerySuggestionBoxStyle"
2833
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
2934
TargetType="{x:Type TextBox}">
30-
<Setter Property="Padding" Value="0,4,50,0" />
35+
<Setter Property="Padding" Value="0 4 50 0" />
3136
<Setter Property="Background" Value="Transparent" />
3237
<Setter Property="Height" Value="38" />
3338
<Setter Property="FontSize" Value="18" />
@@ -72,7 +77,7 @@
7277
TargetType="{x:Type Rectangle}">
7378
<Setter Property="Fill" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
7479
<Setter Property="Height" Value="1" />
75-
<Setter Property="Margin" Value="0,0,0,8" />
80+
<Setter Property="Margin" Value="0 0 0 8" />
7681
</Style>
7782
<Style x:Key="HighlightStyle" />
7883
<Style
@@ -123,7 +128,7 @@
123128
<Setter Property="Background" Value="Transparent" />
124129
<Setter Property="Width" Value="32" />
125130
<Setter Property="Height" Value="32" />
126-
<Setter Property="Margin" Value="0,8,8,0" />
131+
<Setter Property="Margin" Value="0 8 8 0" />
127132
<Setter Property="HorizontalAlignment" Value="Right" />
128133
</Style>
129134

@@ -150,7 +155,7 @@
150155
x:Key="ClockPanel"
151156
BasedOn="{StaticResource ClockPanel}"
152157
TargetType="{x:Type StackPanel}">
153-
<Setter Property="Margin" Value="0,0,54,0" />
158+
<Setter Property="Margin" Value="0 0 54 0" />
154159
</Style>
155160
<Style
156161
x:Key="ClockBox"

Flow.Launcher/Themes/Win10System.xaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<!--
2+
Name: Windows 10
3+
IsDark: True
4+
IsBlur: False
5+
-->
16
<ResourceDictionary
27
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
38
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -27,7 +32,7 @@
2732
<Setter Property="FontSize" Value="22" />
2833
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
2934
<Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
30-
<Setter Property="Padding" Value="0,4,66,0" />
35+
<Setter Property="Padding" Value="0 4 66 0" />
3136
<Setter Property="Height" Value="42" />
3237
</Style>
3338
<Style
@@ -36,7 +41,7 @@
3641
TargetType="{x:Type TextBox}">
3742
<Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
3843
<Setter Property="FontSize" Value="22" />
39-
<Setter Property="Padding" Value="0,4,66,0" />
44+
<Setter Property="Padding" Value="0 4 66 0" />
4045
<Setter Property="Height" Value="42" />
4146
</Style>
4247
<Style
@@ -148,7 +153,7 @@
148153
TargetType="{x:Type Rectangle}">
149154
<Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
150155
<Setter Property="Height" Value="1" />
151-
<Setter Property="Margin" Value="12,0,12,8" />
156+
<Setter Property="Margin" Value="12 0 12 8" />
152157
</Style>
153158
<Style
154159
x:Key="SearchIconStyle"
@@ -163,7 +168,7 @@
163168
<Setter Property="Width" Value="32" />
164169
<Setter Property="Height" Value="32" />
165170
<Setter Property="Background" Value="Transparent" />
166-
<Setter Property="Margin" Value="0,0,16,0" />
171+
<Setter Property="Margin" Value="0 0 16 0" />
167172
<Setter Property="HorizontalAlignment" Value="Right" />
168173
</Style>
169174
<Style

Flow.Launcher/Themes/Win11Light.xaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
Name: Windows 11
33
IsDark: True
4-
BlurAmount: 0
4+
IsBlur: False
55
-->
66
<ResourceDictionary
77
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -34,13 +34,13 @@
3434
BasedOn="{StaticResource BaseGlyphStyle}"
3535
TargetType="{x:Type TextBlock}">
3636
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
37-
<Setter Property="Margin" Value="-4,0,0,0" />
37+
<Setter Property="Margin" Value="-4 0 0 0" />
3838
</Style>
3939
<Style
4040
x:Key="QueryBoxStyle"
4141
BasedOn="{StaticResource BaseQueryBoxStyle}"
4242
TargetType="{x:Type TextBox}">
43-
<Setter Property="Padding" Value="0,0,50,0" />
43+
<Setter Property="Padding" Value="0 0 50 0" />
4444
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
4545
<Setter Property="CaretBrush" Value="{DynamicResource Color05B}" />
4646
<Setter Property="SelectionBrush" Value="{StaticResource SystemAccentColorLight1Brush}" />
@@ -53,7 +53,7 @@
5353
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
5454
TargetType="{x:Type TextBox}">
5555
<Setter Property="Background" Value="Transparent" />
56-
<Setter Property="Padding" Value="0,0,50,0" />
56+
<Setter Property="Padding" Value="0 0 50 0" />
5757
<Setter Property="Height" Value="42" />
5858
<Setter Property="FontSize" Value="18" />
5959
<Setter Property="Foreground" Value="{DynamicResource QuerySuggestionBoxForeground}" />
@@ -96,7 +96,7 @@
9696
TargetType="{x:Type Rectangle}">
9797
<Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
9898
<Setter Property="Height" Value="1" />
99-
<Setter Property="Margin" Value="0,0,0,8" />
99+
<Setter Property="Margin" Value="0 0 0 8" />
100100
</Style>
101101
<Style x:Key="HighlightStyle" />
102102
<Style
@@ -147,7 +147,7 @@
147147
<Setter Property="Background" Value="Transparent" />
148148
<Setter Property="Width" Value="32" />
149149
<Setter Property="Height" Value="32" />
150-
<Setter Property="Margin" Value="0,8,8,0" />
150+
<Setter Property="Margin" Value="0 8 8 0" />
151151
<Setter Property="HorizontalAlignment" Value="Right" />
152152
</Style>
153153

@@ -163,7 +163,7 @@
163163
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
164164
<Setter Property="VerticalAlignment" Value="Center" />
165165
<Setter Property="HorizontalAlignment" Value="Center" />
166-
<Setter Property="Margin" Value="-4,0,0,0" />
166+
<Setter Property="Margin" Value="-4 0 0 0" />
167167
<Setter Property="Width" Value="25" />
168168
<Setter Property="Height" Value="25" />
169169
<Setter Property="FontSize" Value="25" />
@@ -175,7 +175,7 @@
175175
x:Key="ClockPanel"
176176
BasedOn="{StaticResource ClockPanel}"
177177
TargetType="{x:Type StackPanel}">
178-
<Setter Property="Margin" Value="0,0,54,0" />
178+
<Setter Property="Margin" Value="0 0 54 0" />
179179

180180
</Style>
181181
<Style

0 commit comments

Comments
 (0)