Skip to content

Commit 9dc86fd

Browse files
onesoundsonesounds
committed
- Add Clock/Date Colors in Themes
1 parent 4bb6ea9 commit 9dc86fd

18 files changed

+1447
-474
lines changed

‎Flow.Launcher/Themes/Atom.xaml

Lines changed: 104 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,100 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:system="clr-namespace:System;assembly=mscorlib">
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:system="clr-namespace:System;assembly=mscorlib">
45
<ResourceDictionary.MergedDictionaries>
56
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
67
</ResourceDictionary.MergedDictionaries>
7-
<Style x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
8+
<Style
9+
x:Key="ItemGlyph"
10+
BasedOn="{StaticResource BaseGlyphStyle}"
11+
TargetType="{x:Type TextBlock}">
812
<Setter Property="Foreground" Value="#9fb2bf" />
913
</Style>
10-
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
11-
<Setter Property="SelectionBrush" Value="#515a6b"/>
14+
<Style
15+
x:Key="QueryBoxStyle"
16+
BasedOn="{StaticResource BaseQueryBoxStyle}"
17+
TargetType="{x:Type TextBox}">
18+
<Setter Property="SelectionBrush" Value="#515a6b" />
1219
<Setter Property="FontSize" Value="24" />
1320
<Setter Property="Background" Value="#282c34" />
1421
<Setter Property="Foreground" Value="#61afef" />
1522
<Setter Property="CaretBrush" Value="#ffb86c" />
1623
<Setter Property="FontSize" Value="26" />
17-
<Setter Property="Padding" Value="0 4 66 0" />
24+
<Setter Property="Padding" Value="0,4,66,0" />
1825
<Setter Property="Height" Value="42" />
1926
</Style>
20-
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
27+
<Style
28+
x:Key="QuerySuggestionBoxStyle"
29+
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
30+
TargetType="{x:Type TextBox}">
2131
<Setter Property="Background" Value="#282c34" />
2232
<Setter Property="Foreground" Value="#454e61" />
2333
<Setter Property="FontSize" Value="26" />
24-
<Setter Property="Padding" Value="0 4 66 0" />
34+
<Setter Property="Padding" Value="0,4,66,0" />
2535
<Setter Property="Height" Value="42" />
2636
</Style>
27-
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
37+
<Style
38+
x:Key="WindowBorderStyle"
39+
BasedOn="{StaticResource BaseWindowBorderStyle}"
40+
TargetType="{x:Type Border}">
2841
<Setter Property="BorderThickness" Value="2" />
2942
<Setter Property="BorderBrush" Value="#44475a" />
3043
<Setter Property="CornerRadius" Value="5" />
3144
<Setter Property="Background" Value="#282c34" />
3245
</Style>
33-
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
46+
<Style
47+
x:Key="WindowStyle"
48+
BasedOn="{StaticResource BaseWindowStyle}"
49+
TargetType="{x:Type Window}">
3450
<Setter Property="Width" Value="576" />
35-
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled"/>
51+
<Setter Property="RenderOptions.ClearTypeHint" Value="Enabled" />
3652
</Style>
3753

38-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
39-
</Style>
54+
<Style
55+
x:Key="PendingLineStyle"
56+
BasedOn="{StaticResource BasePendingLineStyle}"
57+
TargetType="{x:Type Line}" />
4058

41-
<!-- Item Style -->
42-
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
59+
<!-- Item Style -->
60+
<Style
61+
x:Key="ItemTitleStyle"
62+
BasedOn="{StaticResource BaseItemTitleStyle}"
63+
TargetType="{x:Type TextBlock}">
4364
<Setter Property="Foreground" Value="#9fb2bf" />
4465
</Style>
45-
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
66+
<Style
67+
x:Key="ItemSubTitleStyle"
68+
BasedOn="{StaticResource BaseItemSubTitleStyle}"
69+
TargetType="{x:Type TextBlock}">
4670
<Setter Property="Foreground" Value="#6272a4 " />
4771
<Setter Property="FontSize" Value="13" />
4872
</Style>
49-
<Style x:Key="ItemNumberStyle" BasedOn="{StaticResource BaseItemNumberStyle}" TargetType="{x:Type TextBlock}">
73+
<Style
74+
x:Key="ItemNumberStyle"
75+
BasedOn="{StaticResource BaseItemNumberStyle}"
76+
TargetType="{x:Type TextBlock}">
5077
<Setter Property="Foreground" Value="#6272a4" />
5178
</Style>
52-
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
79+
<Style
80+
x:Key="ItemTitleSelectedStyle"
81+
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
82+
TargetType="{x:Type TextBlock}">
5383
<Setter Property="Cursor" Value="Arrow" />
5484
<Setter Property="Foreground" Value="#e5c07b" />
5585
</Style>
56-
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
86+
<Style
87+
x:Key="ItemSubTitleSelectedStyle"
88+
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
89+
TargetType="{x:Type TextBlock}">
5790
<Setter Property="Cursor" Value="Arrow" />
5891
<Setter Property="Foreground" Value="#c678dd" />
5992
</Style>
6093
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#2c313c</SolidColorBrush>
61-
<Style x:Key="ItemImageSelectedStyle" BasedOn="{StaticResource BaseItemImageSelectedStyle}" TargetType="{x:Type Image}" >
94+
<Style
95+
x:Key="ItemImageSelectedStyle"
96+
BasedOn="{StaticResource BaseItemImageSelectedStyle}"
97+
TargetType="{x:Type Image}">
6298
<Setter Property="Cursor" Value="Arrow" />
6399
</Style>
64100
<Style x:Key="HighlightStyle">
@@ -68,36 +104,67 @@
68104
<Setter Property="FontSize" Value="13" />
69105
<Setter Property="Foreground" Value="#6272a4" />
70106
</Style>
71-
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}">
107+
<Style
108+
x:Key="ItemHotkeySelectedStyle"
109+
BasedOn="{StaticResource BaseItemHotkeySelecetedStyle}"
110+
TargetType="{x:Type TextBlock}">
72111
<Setter Property="FontSize" Value="13" />
73112
<Setter Property="Foreground" Value="#56b6c2" />
74113
</Style>
75-
<!-- button style in the middle of the scrollbar -->
76-
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
77-
<Setter Property="SnapsToDevicePixels" Value="True"/>
78-
<Setter Property="OverridesDefaultStyle" Value="true"/>
79-
<Setter Property="IsTabStop" Value="false"/>
80-
<Setter Property="Width" Value="2"/>
81-
<Setter Property="Focusable" Value="false"/>
114+
<!-- button style in the middle of the scrollbar -->
115+
<Style
116+
x:Key="ThumbStyle"
117+
BasedOn="{StaticResource BaseThumbStyle}"
118+
TargetType="{x:Type Thumb}">
119+
<Setter Property="SnapsToDevicePixels" Value="True" />
120+
<Setter Property="OverridesDefaultStyle" Value="true" />
121+
<Setter Property="IsTabStop" Value="false" />
122+
<Setter Property="Width" Value="2" />
123+
<Setter Property="Focusable" Value="false" />
82124
<Setter Property="Template">
83125
<Setter.Value>
84126
<ControlTemplate TargetType="{x:Type Thumb}">
85-
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#b4b5b7" BorderBrush="Transparent" BorderThickness="0" />
127+
<Border
128+
Background="#b4b5b7"
129+
BorderBrush="Transparent"
130+
BorderThickness="0"
131+
CornerRadius="2"
132+
DockPanel.Dock="Right" />
86133
</ControlTemplate>
87134
</Setter.Value>
88135
</Setter>
89136
</Style>
90-
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
91-
</Style>
92-
<Style x:Key="SeparatorStyle" BasedOn="{StaticResource BaseSeparatorStyle}" TargetType="{x:Type Rectangle}">
93-
<Setter Property="Fill" Value="#495162"/>
94-
<Setter Property="Height" Value="1"/>
95-
<Setter Property="Margin" Value="12 0 12 8"/>
137+
<Style
138+
x:Key="ScrollBarStyle"
139+
BasedOn="{StaticResource BaseScrollBarStyle}"
140+
TargetType="{x:Type ScrollBar}" />
141+
<Style
142+
x:Key="SeparatorStyle"
143+
BasedOn="{StaticResource BaseSeparatorStyle}"
144+
TargetType="{x:Type Rectangle}">
145+
<Setter Property="Fill" Value="#495162" />
146+
<Setter Property="Height" Value="1" />
147+
<Setter Property="Margin" Value="12,0,12,8" />
96148
</Style>
97-
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
149+
<Style
150+
x:Key="SearchIconStyle"
151+
BasedOn="{StaticResource BaseSearchIconStyle}"
152+
TargetType="{x:Type Path}">
98153
<Setter Property="Fill" Value="#495162" />
99154
<Setter Property="Width" Value="32" />
100155
<Setter Property="Height" Value="32" />
101156
<Setter Property="Opacity" Value="0.8" />
102157
</Style>
158+
<Style
159+
x:Key="ClockBox"
160+
BasedOn="{StaticResource BaseClockBox}"
161+
TargetType="{x:Type TextBlock}">
162+
<Setter Property="Foreground" Value="#495162" />
163+
</Style>
164+
<Style
165+
x:Key="DateBox"
166+
BasedOn="{StaticResource BaseDateBox}"
167+
TargetType="{x:Type TextBlock}">
168+
<Setter Property="Foreground" Value="#495162" />
169+
</Style>
103170
</ResourceDictionary>

‎Flow.Launcher/Themes/BlurBlack Darker.xaml

Lines changed: 88 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,125 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:system="clr-namespace:System;assembly=mscorlib">
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:system="clr-namespace:System;assembly=mscorlib">
45
<ResourceDictionary.MergedDictionaries>
56
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
67
</ResourceDictionary.MergedDictionaries>
78

89
<system:Boolean x:Key="ThemeBlurEnabled">True</system:Boolean>
910

10-
<Style x:Key="ItemGlyph" BasedOn="{StaticResource BaseGlyphStyle}" TargetType="{x:Type TextBlock}">
11+
<Style
12+
x:Key="ItemGlyph"
13+
BasedOn="{StaticResource BaseGlyphStyle}"
14+
TargetType="{x:Type TextBlock}">
1115
<Setter Property="Foreground" Value="#ffffff" />
1216
</Style>
13-
<Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
17+
<Style
18+
x:Key="QueryBoxStyle"
19+
BasedOn="{StaticResource BaseQueryBoxStyle}"
20+
TargetType="{x:Type TextBox}">
1421
<Setter Property="Foreground" Value="#FFFFFFFF" />
1522
<Setter Property="Background" Value="Transparent" />
1623
</Style>
1724

18-
<Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
25+
<Style
26+
x:Key="QuerySuggestionBoxStyle"
27+
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
28+
TargetType="{x:Type TextBox}">
1929
<Setter Property="Foreground" Value="LightGray" />
2030
<Setter Property="Opacity" Value="0.5" />
2131
</Style>
2232

23-
<Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
33+
<Style
34+
x:Key="WindowBorderStyle"
35+
BasedOn="{StaticResource BaseWindowBorderStyle}"
36+
TargetType="{x:Type Border}">
2437
<Setter Property="Background">
2538
<Setter.Value>
26-
<SolidColorBrush Color="Black" Opacity="0.6"/>
39+
<SolidColorBrush Opacity="0.6" Color="Black" />
2740
</Setter.Value>
2841
</Setter>
2942
</Style>
3043

31-
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
44+
<Style
45+
x:Key="WindowStyle"
46+
BasedOn="{StaticResource BaseWindowStyle}"
47+
TargetType="{x:Type Window}">
3248
<Setter Property="Background">
3349
<Setter.Value>
34-
<SolidColorBrush Color="Black" Opacity="0.7"/>
50+
<SolidColorBrush Opacity="0.7" Color="Black" />
3551
</Setter.Value>
3652
</Setter>
3753
</Style>
3854

39-
<Style x:Key="PendingLineStyle" BasedOn="{StaticResource BasePendingLineStyle}" TargetType="{x:Type Line}">
55+
<Style
56+
x:Key="PendingLineStyle"
57+
BasedOn="{StaticResource BasePendingLineStyle}"
58+
TargetType="{x:Type Line}">
4059
<Setter Property="Stroke" Value="White" />
4160
</Style>
4261

43-
<!-- Item Style -->
44-
<Style x:Key="ItemTitleStyle" BasedOn="{StaticResource BaseItemTitleStyle}" TargetType="{x:Type TextBlock}">
45-
<Setter Property="Margin" Value="0, -10"/>
46-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
62+
<!-- Item Style -->
63+
<Style
64+
x:Key="ItemTitleStyle"
65+
BasedOn="{StaticResource BaseItemTitleStyle}"
66+
TargetType="{x:Type TextBlock}">
67+
<Setter Property="Margin" Value="0,-10" />
68+
<Setter Property="Foreground" Value="#FFFFFFFF" />
4769
</Style>
48-
<Style x:Key="ItemSubTitleStyle" BasedOn="{StaticResource BaseItemSubTitleStyle}" TargetType="{x:Type TextBlock}" >
49-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
70+
<Style
71+
x:Key="ItemSubTitleStyle"
72+
BasedOn="{StaticResource BaseItemSubTitleStyle}"
73+
TargetType="{x:Type TextBlock}">
74+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5075
<Setter Property="Opacity" Value="0.5" />
5176
</Style>
52-
<Style x:Key="ItemTitleSelectedStyle" BasedOn="{StaticResource BaseItemTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
53-
<Setter Property="Margin" Value="0, -10"/>
54-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
77+
<Style
78+
x:Key="ItemTitleSelectedStyle"
79+
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
80+
TargetType="{x:Type TextBlock}">
81+
<Setter Property="Margin" Value="0,-10" />
82+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5583
</Style>
56-
<Style x:Key="ItemSubTitleSelectedStyle" BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}" TargetType="{x:Type TextBlock}" >
57-
<Setter Property="Foreground" Value="#FFFFFFFF"/>
84+
<Style
85+
x:Key="ItemSubTitleSelectedStyle"
86+
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
87+
TargetType="{x:Type TextBlock}">
88+
<Setter Property="Foreground" Value="#FFFFFFFF" />
5889
<Setter Property="Opacity" Value="0.5" />
5990
</Style>
6091
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#356ef3</SolidColorBrush>
6192

62-
<!-- button style in the middle of the scrollbar -->
63-
<Style x:Key="ThumbStyle" BasedOn="{StaticResource BaseThumbStyle}" TargetType="{x:Type Thumb}">
93+
<!-- button style in the middle of the scrollbar -->
94+
<Style
95+
x:Key="ThumbStyle"
96+
BasedOn="{StaticResource BaseThumbStyle}"
97+
TargetType="{x:Type Thumb}">
6498
<Setter Property="Template">
6599
<Setter.Value>
66100
<ControlTemplate TargetType="{x:Type Thumb}">
67-
<Border CornerRadius="2" DockPanel.Dock="Right" Background="#FFFFFF" Opacity="0.5" BorderBrush="Transparent" BorderThickness="0" />
101+
<Border
102+
Background="#FFFFFF"
103+
BorderBrush="Transparent"
104+
BorderThickness="0"
105+
CornerRadius="2"
106+
DockPanel.Dock="Right"
107+
Opacity="0.5" />
68108
</ControlTemplate>
69109
</Setter.Value>
70110
</Setter>
71111
</Style>
72112

73-
<Style x:Key="ScrollBarStyle" BasedOn="{StaticResource BaseScrollBarStyle}" TargetType="{x:Type ScrollBar}">
74-
<Setter Property="Background" Value="#a0a0a0"/>
113+
<Style
114+
x:Key="ScrollBarStyle"
115+
BasedOn="{StaticResource BaseScrollBarStyle}"
116+
TargetType="{x:Type ScrollBar}">
117+
<Setter Property="Background" Value="#a0a0a0" />
75118
</Style>
76-
<Style x:Key="SearchIconStyle" TargetType="{x:Type Path}" BasedOn="{StaticResource BaseSearchIconStyle}">
119+
<Style
120+
x:Key="SearchIconStyle"
121+
BasedOn="{StaticResource BaseSearchIconStyle}"
122+
TargetType="{x:Type Path}">
77123
<Setter Property="Fill" Value="#ffffff" />
78124
<Setter Property="Width" Value="32" />
79125
<Setter Property="Height" Value="32" />
@@ -89,4 +135,18 @@
89135
<Setter Property="Foreground" Value="#ffffff" />
90136
<Setter Property="Opacity" Value="0.2" />
91137
</Style>
138+
<Style
139+
x:Key="ClockBox"
140+
BasedOn="{StaticResource BaseClockBox}"
141+
TargetType="{x:Type TextBlock}">
142+
<Setter Property="Foreground" Value="#ffffff" />
143+
<Setter Property="Opacity" Value="0.2" />
144+
</Style>
145+
<Style
146+
x:Key="DateBox"
147+
BasedOn="{StaticResource BaseDateBox}"
148+
TargetType="{x:Type TextBlock}">
149+
<Setter Property="Foreground" Value="#ffffff" />
150+
<Setter Property="Opacity" Value="0.2" />
151+
</Style>
92152
</ResourceDictionary>

0 commit comments

Comments
 (0)