Skip to content

Commit 06f805e

Browse files
Jack251970Jack251970
committed
Organize resources
1 parent 01f3459 commit 06f805e

File tree

2 files changed

+7
-47
lines changed

2 files changed

+7
-47
lines changed

‎Flow.Launcher/Resources/Dark.xaml‎

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,12 @@
5555
<SolidColorBrush x:Key="CustomNumberBoxBG" Color="#292929" />
5656
<SolidColorBrush x:Key="PluginInfoColor" Color="#878787" />
5757

58-
<SolidColorBrush x:Key="BasicLabelColor" Color="#ffffff" />
59-
<SolidColorBrush x:Key="BasicSeparatorColor" Color="#cecece" />
60-
<SolidColorBrush x:Key="BasicLineColor" Color="#cecece" />
61-
6258
<SolidColorBrush x:Key="NewHotkeyForeground" Color="#44FFFFFF" />
6359
<SolidColorBrush x:Key="BasicHotkeyBGColor" Color="#13FFFFFF" />
6460

6561
<SolidColorBrush x:Key="ThemeHoverButton" Color="#3c3c3c" />
62+
63+
<!-- Typo -->
6664
<SolidColorBrush x:Key="PopuBGColor" Color="#202020" />
6765
<SolidColorBrush x:Key="PopupBGColor" Color="#202020" />
6866
<SolidColorBrush x:Key="PopupTextColor" Color="#cfcfcf" />
@@ -76,8 +74,6 @@
7674
<SolidColorBrush x:Key="CustomContextDisabled" Color="#868686" />
7775
<SolidColorBrush x:Key="ContextSeparator" Color="#3c3c3c" />
7876

79-
<SolidColorBrush x:Key="HoverStoreGrid2">#272727</SolidColorBrush>
80-
8177
<Color x:Key="Color01">#202020</Color>
8278
<Color x:Key="Color02">#2b2b2b</Color>
8379
<Color x:Key="Color03">#1d1d1d</Color>
@@ -107,8 +103,6 @@
107103
<Color x:Key="NumberBoxColor24">#f5f5f5</Color>
108104
<Color x:Key="NumberBoxColor25">#464646</Color>
109105
<Color x:Key="NumberBoxColor26">#ffffff</Color>
110-
<SolidColorBrush x:Key="NumberBoxPlaceHolder" Color="#464646" />
111-
<Color x:Key="HoverStoreGrid">#272727</Color>
112106

113107
<!-- Resources for HotkeyControl -->
114108
<SolidColorBrush x:Key="CustomHotkeyHover" Color="#323232" />
@@ -119,20 +113,12 @@
119113
<!-- Resource for ContentDialog -->
120114
<SolidColorBrush x:Key="ContentDialogOverlayBG" Color="#58000000" />
121115

122-
<!-- DIY Infobar -->
116+
<!-- Resource for HotkeyControlDialog -->
123117
<SolidColorBrush x:Key="InfoBarBD" Color="#19000000" />
124-
<SolidColorBrush
125-
x:Key="InfoBarInfoIcon"
126-
Opacity="0.9"
127-
Color="{m:DynamicColor SystemAccentColor}" />
128-
<SolidColorBrush x:Key="InfoBarInfoBG" Color="#272727" />
129118
<SolidColorBrush x:Key="InfoBarWarningIcon" Color="#fce100" />
130119
<SolidColorBrush x:Key="InfoBarWarningBG" Color="#433519" />
131-
<SolidColorBrush x:Key="InfoBarSuccessIcon" Color="#6ccb5f" />
132-
<SolidColorBrush x:Key="InfoBarSuccessBG" Color="#393d1b" />
133-
<SolidColorBrush x:Key="InfoBarErrorIcon" Color="#ff99a4" />
134-
<SolidColorBrush x:Key="InfoBarErrorBG" Color="#442726" />
135120

121+
<!-- Resource for TitleBar -->
136122
<SolidColorBrush x:Key="MouseOverWindowCloseButtonForegroundBrush" Color="#ffffff" />
137123

138124
<SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
@@ -153,11 +139,4 @@
153139
<Thickness x:Key="DisabledCustomButtonOutBorderThickness">0,0,0,0</Thickness>
154140
<Thickness x:Key="DisabledCustomButtonInsideBorderThickness">1,1,1,1</Thickness>
155141

156-
<SolidColorBrush x:Key="CustomRadioBorder" Color="#999999" />
157-
<SolidColorBrush x:Key="CustomRadioBackground" Color="#1d1d1d" />
158-
<SolidColorBrush x:Key="HoverCustomRadioBorder" Color="#999999" />
159-
<SolidColorBrush x:Key="HoverCustomRadioBackground" Color="#1d1d1d" />
160-
<SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
161-
<SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#1d1d1d" />
162-
163142
</ResourceDictionary>

‎Flow.Launcher/Resources/Light.xaml‎

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@
5151
<SolidColorBrush x:Key="NumberBoxColor26B" Color="#1b1b1b" />
5252
<SolidColorBrush x:Key="CustomNumberBoxBG" Color="#fdfdfd" />
5353
<SolidColorBrush x:Key="PluginInfoColor" Color="#8f8f8f" />
54-
<SolidColorBrush x:Key="BasicLabelColor" Color="#1b1b1b" />
5554

5655
<SolidColorBrush x:Key="NewHotkeyForeground" Color="#5E000000" />
5756
<SolidColorBrush x:Key="BasicHotkeyBGColor" Color="#0A000000" />
5857

5958
<SolidColorBrush x:Key="ThemeHoverButton" Color="#f6f6f6" />
59+
6060
<!-- Typo -->
6161
<SolidColorBrush x:Key="PopuBGColor" Color="#ffffff" />
6262
<SolidColorBrush x:Key="PopupBGColor" Color="#ffffff" />
@@ -71,8 +71,6 @@
7171
<SolidColorBrush x:Key="CustomContextDisabled" Color="#868686" />
7272
<SolidColorBrush x:Key="ContextSeparator" Color="#dadada" />
7373

74-
<SolidColorBrush x:Key="HoverStoreGrid2">#f6f6f6</SolidColorBrush>
75-
7674
<Color x:Key="Color01">#f3f3f3</Color>
7775
<Color x:Key="Color02">#ffffff</Color>
7876
<Color x:Key="Color03">#e5e5e5</Color>
@@ -99,8 +97,6 @@
9997
<Color x:Key="NumberBoxColor24">#f5f5f5</Color>
10098
<Color x:Key="NumberBoxColor25">#878787</Color>
10199
<Color x:Key="NumberBoxColor26">#1b1b1b</Color>
102-
<SolidColorBrush x:Key="NumberBoxPlaceHolder" Color="#A2A2A2" />
103-
<Color x:Key="HoverStoreGrid">#f6f6f6</Color>
104100

105101
<!-- Resources for HotkeyControl -->
106102
<SolidColorBrush x:Key="CustomHotkeyHover" Color="#f6f6f6" />
@@ -111,20 +107,12 @@
111107
<!-- Resource for ContentDialog -->
112108
<SolidColorBrush x:Key="ContentDialogOverlayBG" Color="#4D000000" />
113109

114-
<!-- DIY Infobar -->
110+
<!-- Resource for HotkeyControlDialog -->
115111
<SolidColorBrush x:Key="InfoBarBD" Color="#0F000000" />
116-
<SolidColorBrush
117-
x:Key="InfoBarInfoIcon"
118-
Opacity="0.8"
119-
Color="{m:DynamicColor SystemAccentColor}" />
120-
<SolidColorBrush x:Key="InfoBarInfoBG" Color="{m:DynamicColor Color01}" />
121112
<SolidColorBrush x:Key="InfoBarWarningIcon" Color="#9D5D00" />
122113
<SolidColorBrush x:Key="InfoBarWarningBG" Color="#FFF4CE" />
123-
<SolidColorBrush x:Key="InfoBarSuccessIcon" Color="#3f973e" />
124-
<SolidColorBrush x:Key="InfoBarSuccessBG" Color="#dff6dd" />
125-
<SolidColorBrush x:Key="InfoBarErrorIcon" Color="#c42b1c" />
126-
<SolidColorBrush x:Key="InfoBarErrorBG" Color="#fde7e9" />
127114

115+
<!-- Resource for TitleBar -->
128116
<SolidColorBrush x:Key="MouseOverWindowCloseButtonForegroundBrush" Color="#ffffff" />
129117

130118
<SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
@@ -145,11 +133,4 @@
145133
<Thickness x:Key="DisabledCustomButtonOutBorderThickness">1,1,1,1</Thickness>
146134
<Thickness x:Key="DisabledCustomButtonInsideBorderThickness">0,0,0,0</Thickness>
147135

148-
<SolidColorBrush x:Key="CustomRadioBorder" Color="#858585" />
149-
<SolidColorBrush x:Key="CustomRadioBackground" Color="#ededed" />
150-
<SolidColorBrush x:Key="HoverCustomRadioBorder" Color="#858585" />
151-
<SolidColorBrush x:Key="HoverCustomRadioBackground" Color="#e5e5e5" />
152-
<SolidColorBrush x:Key="PressedCustomRadioBorder" Color="#b4b4b4" />
153-
<SolidColorBrush x:Key="PressedCustomRadioBackground" Color="#dcdcdc" />
154-
155136
</ResourceDictionary>

0 commit comments

Comments
 (0)