Skip to content

Commit 53d647f

Browse files
onesoundsonesounds
committed
Adjust Themes for fluent
1 parent aeb3f22 commit 53d647f

File tree

8 files changed

+44
-33
lines changed

8 files changed

+44
-33
lines changed

‎Flow.Launcher/Resources/Dark.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
xmlns:sys="clr-namespace:System;assembly=mscorlib">
88

99
<SolidColorBrush x:Key="SystemThemeBorder" Color="#3f3f3f" />
10-
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#4d4d4d" />
10+
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#33FFFFFF" />
1111
<SolidColorBrush x:Key="QuerySelectionBrush" Color="#4a5459" />
12-
<SolidColorBrush x:Key="SubTitleForeground" Color="#7b7b7b" />
13-
<SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#7b7b7b" />
14-
<SolidColorBrush x:Key="SearchIconForeground" Color="#4d4d4d" />
15-
<SolidColorBrush x:Key="SeparatorForeground" Color="#14ffffff" />
12+
<SolidColorBrush x:Key="SubTitleForeground" Color="#33FFFFFF" />
13+
<SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#33FFFFFF" />
14+
<SolidColorBrush x:Key="SearchIconForeground" Color="#33FFFFFF" />
15+
<SolidColorBrush x:Key="SeparatorForeground" Color="#24FFFFFF" />
1616
<SolidColorBrush x:Key="ThumbColor" Color="#9a9a9a" />
1717
<SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
18-
<SolidColorBrush x:Key="HotkeyForeground" Color="#7b7b7b" />
19-
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#7b7b7b" />
20-
<SolidColorBrush x:Key="ClockDateForeground" Color="#4d4d4d" />
18+
<SolidColorBrush x:Key="HotkeyForeground" Color="#33FFFFFF" />
19+
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#33FFFFFF" />
20+
<SolidColorBrush x:Key="ClockDateForeground" Color="#26FFFFFF" />
2121
<Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
2222

2323

‎Flow.Launcher/Resources/Light.xaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
xmlns:sys="clr-namespace:System;assembly=mscorlib">
88

99
<SolidColorBrush x:Key="SystemThemeBorder" Color="#aaaaaa" />
10-
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#d8d2d0" />
10+
<SolidColorBrush x:Key="QuerySuggestionBoxForeground" Color="#51000000" />
1111
<SolidColorBrush x:Key="QuerySelectionBrush" Color="#0a68d8" />
1212
<SolidColorBrush x:Key="SubTitleForeground" Color="#818181" />
1313
<SolidColorBrush x:Key="SubTitleSelectedForeground" Color="#72767d" />
14-
<SolidColorBrush x:Key="SearchIconForeground" Color="#d3d3d3" />
15-
<SolidColorBrush x:Key="SeparatorForeground" Color="#14000000" />
14+
<SolidColorBrush x:Key="SearchIconForeground" Color="#20000000" />
15+
<SolidColorBrush x:Key="SeparatorForeground" Color="#20000000" />
1616
<SolidColorBrush x:Key="ThumbColor" Color="#868686" />
1717
<SolidColorBrush x:Key="InlineHighlight" Color="#0078d7" />
18-
<SolidColorBrush x:Key="HotkeyForeground" Color="#acacac" />
19-
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#acacac" />
20-
<SolidColorBrush x:Key="ClockDateForeground" Color="#d3d3d3" />
21-
<Color x:Key="ItemSelectedBackgroundColorBrush">#198F8F8F</Color>
18+
<SolidColorBrush x:Key="HotkeyForeground" Color="#51000000" />
19+
<SolidColorBrush x:Key="HotkeySelectedForeground" Color="#51000000" />
20+
<SolidColorBrush x:Key="ClockDateForeground" Color="#44000000" />
21+
<Color x:Key="ItemSelectedBackgroundColorBrush">#0C000000</Color>
2222

2323
<SolidColorBrush x:Key="Color00B" Color="#fbfbfb" />
2424
<SolidColorBrush x:Key="Color01B" Color="#f3f3f3" />

‎Flow.Launcher/Themes/BlurBlack Darker.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@
143143
BasedOn="{StaticResource BaseSearchIconStyle}"
144144
TargetType="{x:Type Path}">
145145
<Setter Property="Fill" Value="#ffffff" />
146-
<Setter Property="Width" Value="32" />
147-
<Setter Property="Height" Value="32" />
146+
<Setter Property="Width" Value="30" />
147+
<Setter Property="Height" Value="30" />
148148
<Setter Property="Opacity" Value="0.2" />
149149
</Style>
150150
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">

‎Flow.Launcher/Themes/BlurBlack.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@
139139
BasedOn="{StaticResource BaseSearchIconStyle}"
140140
TargetType="{x:Type Path}">
141141
<Setter Property="Fill" Value="#ffffff" />
142-
<Setter Property="Width" Value="32" />
143-
<Setter Property="Height" Value="32" />
142+
<Setter Property="Width" Value="30" />
143+
<Setter Property="Height" Value="30" />
144144
<Setter Property="Opacity" Value="0.5" />
145145
</Style>
146146
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">

‎Flow.Launcher/Themes/BlurWhite.xaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@
2121
TargetType="{x:Type TextBlock}">
2222
<Setter Property="Foreground" Value="#FF000000" />
2323
</Style>
24+
<Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
25+
<Setter Property="Foreground" Value="#FF000000" />
26+
<Setter Property="VerticalAlignment" Value="Center" />
27+
<Setter Property="HorizontalAlignment" Value="Center" />
28+
<Setter Property="Width" Value="25" />
29+
<Setter Property="Height" Value="25" />
30+
<Setter Property="FontSize" Value="25" />
31+
</Style>
2432
<Style x:Key="WindowRadius" TargetType="{x:Type Border}">
2533
<Setter Property="CornerRadius" Value="0" />
2634
</Style>
@@ -79,7 +87,7 @@
7987
x:Key="ItemSubTitleStyle"
8088
BasedOn="{StaticResource BaseItemSubTitleStyle}"
8189
TargetType="{x:Type TextBlock}">
82-
<Setter Property="Foreground" Value="#818181" />
90+
<Setter Property="Foreground" Value="#85000000" />
8391
</Style>
8492
<Style
8593
x:Key="ItemTitleSelectedStyle"
@@ -91,12 +99,12 @@
9199
x:Key="ItemSubTitleSelectedStyle"
92100
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
93101
TargetType="{x:Type TextBlock}">
94-
<Setter Property="Foreground" Value="#72767d" />
102+
<Setter Property="Foreground" Value="#85000000" />
95103
</Style>
96104
<SolidColorBrush
97105
x:Key="ItemSelectedBackgroundColor"
98-
Opacity="0.5"
99-
Color="#ccd0d4" />
106+
Opacity="0.6"
107+
Color="#33000000" />
100108

101109
<Style
102110
x:Key="SeparatorStyle"
@@ -135,8 +143,8 @@
135143
BasedOn="{StaticResource BaseSearchIconStyle}"
136144
TargetType="{x:Type Path}">
137145
<Setter Property="Fill" Value="#000000" />
138-
<Setter Property="Width" Value="32" />
139-
<Setter Property="Height" Value="32" />
146+
<Setter Property="Width" Value="30" />
147+
<Setter Property="Height" Value="30" />
140148
<Setter Property="Opacity" Value="0.2" />
141149
</Style>
142150
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">

‎Flow.Launcher/Themes/Circle System.xaml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
</ResourceDictionary.MergedDictionaries>
1515
<system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
1616
<system:String x:Key="SystemBG">Auto</system:String>
17-
<Color x:Key="LightBG">#BFFAFAFA</Color>
18-
<Color x:Key="DarkBG">#BC202020</Color>
17+
<system:String x:Key="CornerType">Round</system:String>
18+
<Color x:Key="LightBG">#E5E6E6E6</Color>
19+
<Color x:Key="DarkBG">#DF1F1F1F</Color>
1920
<Style
2021
x:Key="ItemGlyph"
2122
BasedOn="{StaticResource BaseGlyphStyle}"
@@ -27,7 +28,7 @@
2728
BasedOn="{StaticResource BaseQueryBoxStyle}"
2829
TargetType="{x:Type TextBox}">
2930
<Setter Property="Padding" Value="0 4 50 0" />
30-
<Setter Property="Foreground" Value="{m:DynamicColor SystemControlPageTextBaseHighBrush}" />
31+
<Setter Property="Foreground" Value="{m:DynamicColor SystemControlHighlightBaseHighBrush}" />
3132
<Setter Property="FontSize" Value="18" />
3233
<Setter Property="Height" Value="38" />
3334
</Style>
@@ -79,7 +80,7 @@
7980
x:Key="SeparatorStyle"
8081
BasedOn="{StaticResource BaseSeparatorStyle}"
8182
TargetType="{x:Type Rectangle}">
82-
<Setter Property="Fill" Value="{m:DynamicColor SystemControlBackgroundChromeMediumBrush}" />
83+
<Setter Property="Fill" Value="{DynamicResource SeparatorForeground}" />
8384
<Setter Property="Height" Value="1" />
8485
<Setter Property="Margin" Value="0 0 0 8" />
8586
</Style>

‎Flow.Launcher/Themes/Darker.xaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
<Style
3030
x:Key="WindowBorderStyle"
3131
BasedOn="{StaticResource BaseWindowBorderStyle}"
32-
TargetType="{x:Type Border}" />
32+
TargetType="{x:Type Border}">
33+
<Setter Property="Background" Value="#2F2F2F" />
34+
</Style>
3335

3436
<Style
3537
x:Key="WindowStyle"
@@ -89,7 +91,7 @@
8991
TargetType="{x:Type Rectangle}">
9092
<Setter Property="Fill" Value="#3b3b3b" />
9193
<Setter Property="Height" Value="1" />
92-
<Setter Property="Margin" Value="8,0,8,8" />
94+
<Setter Property="Margin" Value="8 0 8 8" />
9395
</Style>
9496
<Style
9597
x:Key="PreviewBorderStyle"

‎Flow.Launcher/Themes/Win10System.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@
179179
x:Key="ClockBox"
180180
BasedOn="{StaticResource BaseClockBox}"
181181
TargetType="{x:Type TextBlock}">
182-
<Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
182+
<Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
183183
</Style>
184184
<Style
185185
x:Key="DateBox"
186186
BasedOn="{StaticResource BaseDateBox}"
187187
TargetType="{x:Type TextBlock}">
188-
<Setter Property="Foreground" Value="{DynamicResource ClockDateForeground}" />
188+
<Setter Property="Foreground" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
189189
</Style>
190190
<Style
191191
x:Key="PreviewBorderStyle"

0 commit comments

Comments
 (0)