Skip to content

Commit 96ffd06

Browse files
committed
- Change Darker Glass theme
1 parent 398dfa5 commit 96ffd06

File tree

1 file changed

+76
-54
lines changed

1 file changed

+76
-54
lines changed
Lines changed: 76 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,57 @@
1+
<!--
2+
Name: Rider
3+
IsDark: False
4+
HasBlur: False
5+
-->
16
<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">
10+
511
<ResourceDictionary.MergedDictionaries>
612
<ResourceDictionary Source="pack://application:,,,/Themes/Base.xaml" />
713
</ResourceDictionary.MergedDictionaries>
8-
<Thickness x:Key="ResultMargin">0 0 0 8</Thickness>
914
<Style
1015
x:Key="ItemGlyph"
1116
BasedOn="{StaticResource BaseGlyphStyle}"
1217
TargetType="{x:Type TextBlock}">
13-
<Setter Property="Foreground" Value="#ebebeb" />
18+
<Setter Property="Foreground" Value="#dfe1e5" />
1419
</Style>
1520
<Style
1621
x:Key="QueryBoxStyle"
1722
BasedOn="{StaticResource BaseQueryBoxStyle}"
1823
TargetType="{x:Type TextBox}">
19-
<Setter Property="Foreground" Value="#ebebeb" />
20-
<Setter Property="Background" Value="Transparent" />
24+
<Setter Property="Padding" Value="0 4 50 0" />
25+
<Setter Property="Foreground" Value="#dfe1e5" />
26+
<Setter Property="FontSize" Value="18" />
27+
<Setter Property="Height" Value="38" />
2128
</Style>
2229

2330
<Style
2431
x:Key="QuerySuggestionBoxStyle"
2532
BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}"
2633
TargetType="{x:Type TextBox}">
27-
<Setter Property="Foreground" Value="#ebebeb" />
28-
<Setter Property="Opacity" Value="0.2" />
34+
<Setter Property="Padding" Value="0 4 50 0" />
35+
<Setter Property="Background" Value="Transparent" />
36+
<Setter Property="Height" Value="38" />
37+
<Setter Property="FontSize" Value="18" />
38+
<Setter Property="Foreground" Value="#24DFE1E5" />
2939
</Style>
3040

3141
<Style
3242
x:Key="WindowBorderStyle"
3343
BasedOn="{StaticResource BaseWindowBorderStyle}"
3444
TargetType="{x:Type Border}">
35-
<Setter Property="CornerRadius" Value="5" />
36-
<Setter Property="BorderThickness" Value="1,1,0,0" />
37-
<Setter Property="BorderBrush" Value="#666666" />
38-
<Setter Property="Background">
39-
<Setter.Value>
40-
<SolidColorBrush Opacity="0.95" Color="#333333" />
41-
</Setter.Value>
42-
</Setter>
45+
<Setter Property="BorderThickness" Value="1" />
46+
<Setter Property="BorderBrush" Value="#393b40" />
47+
<Setter Property="Background" Value="#2b2d30" />
48+
<Setter Property="CornerRadius" Value="8" />
49+
<Setter Property="UseLayoutRounding" Value="True" />
4350
</Style>
44-
4551
<Style
4652
x:Key="WindowStyle"
4753
BasedOn="{StaticResource BaseWindowStyle}"
48-
TargetType="{x:Type Window}">
49-
<Setter Property="Background">
50-
<Setter.Value>
51-
<SolidColorBrush Opacity="0.5" Color="White" />
52-
</Setter.Value>
53-
</Setter>
54-
</Style>
55-
54+
TargetType="{x:Type Window}" />
5655
<Style
5756
x:Key="PendingLineStyle"
5857
BasedOn="{StaticResource BasePendingLineStyle}"
@@ -63,27 +62,36 @@
6362
x:Key="ItemTitleStyle"
6463
BasedOn="{StaticResource BaseItemTitleStyle}"
6564
TargetType="{x:Type TextBlock}">
66-
<Setter Property="Foreground" Value="#ebebeb" />
65+
<Setter Property="Foreground" Value="#dfe1e5" />
6766
</Style>
6867
<Style
6968
x:Key="ItemSubTitleStyle"
7069
BasedOn="{StaticResource BaseItemSubTitleStyle}"
7170
TargetType="{x:Type TextBlock}">
72-
<Setter Property="Foreground" Value="#787878" />
71+
<Setter Property="Foreground" Value="#6f737a" />
7372
</Style>
73+
<Style
74+
x:Key="SeparatorStyle"
75+
BasedOn="{StaticResource BaseSeparatorStyle}"
76+
TargetType="{x:Type Rectangle}">
77+
<Setter Property="Fill" Value="#393b40" />
78+
<Setter Property="Height" Value="1" />
79+
<Setter Property="Margin" Value="0 0 0 8" />
80+
</Style>
81+
<Style x:Key="HighlightStyle" />
7482
<Style
7583
x:Key="ItemTitleSelectedStyle"
7684
BasedOn="{StaticResource BaseItemTitleSelectedStyle}"
7785
TargetType="{x:Type TextBlock}">
78-
<Setter Property="Foreground" Value="#ffffff" />
86+
<Setter Property="Foreground" Value="#dfe1e5" />
7987
</Style>
8088
<Style
8189
x:Key="ItemSubTitleSelectedStyle"
8290
BasedOn="{StaticResource BaseItemSubTitleSelectedStyle}"
8391
TargetType="{x:Type TextBlock}">
84-
<Setter Property="Foreground" Value="#949494" />
92+
<Setter Property="Foreground" Value="#dfe1e5" />
8593
</Style>
86-
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#545454</SolidColorBrush>
94+
<SolidColorBrush x:Key="ItemSelectedBackgroundColor">#2e436e</SolidColorBrush>
8795

8896
<!-- button style in the middle of the scrollbar -->
8997
<Style
@@ -94,7 +102,7 @@
94102
<Setter.Value>
95103
<ControlTemplate TargetType="{x:Type Thumb}">
96104
<Border
97-
Background="#525252"
105+
Background="#393b40"
98106
BorderBrush="Transparent"
99107
BorderThickness="0"
100108
CornerRadius="2"
@@ -106,69 +114,83 @@
106114
<Style
107115
x:Key="ScrollBarStyle"
108116
BasedOn="{StaticResource BaseScrollBarStyle}"
109-
TargetType="{x:Type ScrollBar}">
110-
<Setter Property="Background" Value="#a0a0a0" />
111-
</Style>
117+
TargetType="{x:Type ScrollBar}" />
112118
<Style
113119
x:Key="SearchIconStyle"
114120
BasedOn="{StaticResource BaseSearchIconStyle}"
115121
TargetType="{x:Type Path}">
116-
<Setter Property="Fill" Value="#FFFFFF" />
122+
<Setter Property="Fill" Value="#6f737a" />
123+
<Setter Property="Width" Value="24" />
124+
<Setter Property="Height" Value="24" />
125+
</Style>
126+
<Style x:Key="SearchIconPosition" TargetType="{x:Type Canvas}">
127+
<Setter Property="Background" Value="#2b2d30" />
117128
<Setter Property="Width" Value="32" />
118129
<Setter Property="Height" Value="32" />
119-
<Setter Property="Opacity" Value="0.2" />
120-
</Style>
121-
<Style
122-
x:Key="SeparatorStyle"
123-
BasedOn="{StaticResource BaseSeparatorStyle}"
124-
TargetType="{x:Type Rectangle}">
125-
<Setter Property="Fill" Value="#474747" />
126-
<Setter Property="Height" Value="1" />
127-
<Setter Property="Margin" Value="0,0,0,8" />
130+
<Setter Property="Margin" Value="0 8 8 0" />
131+
<Setter Property="HorizontalAlignment" Value="Right" />
128132
</Style>
133+
129134
<Style x:Key="ItemHotkeyStyle" TargetType="{x:Type TextBlock}">
130-
<Setter Property="FontSize" Value="14" />
131-
<Setter Property="Foreground" Value="#787878" />
135+
<Setter Property="FontSize" Value="12" />
136+
<Setter Property="Foreground" Value="#6f737a" />
132137
</Style>
133138
<Style x:Key="ItemHotkeySelectedStyle" TargetType="{x:Type TextBlock}">
134-
<Setter Property="FontSize" Value="14" />
135-
<Setter Property="Foreground" Value="#787878" />
139+
<Setter Property="FontSize" Value="12" />
140+
<Setter Property="Foreground" Value="#6f737a" />
141+
</Style>
142+
<Style x:Key="ItemGlyphSelectedStyle" TargetType="{x:Type TextBlock}">
143+
<Setter Property="Foreground" Value="#dfe1e5" />
144+
<Setter Property="VerticalAlignment" Value="Center" />
145+
<Setter Property="HorizontalAlignment" Value="Center" />
146+
<Setter Property="Width" Value="25" />
147+
<Setter Property="Height" Value="25" />
148+
<Setter Property="FontSize" Value="25" />
149+
</Style>
150+
<CornerRadius x:Key="ItemRadius">8</CornerRadius>
151+
<Thickness x:Key="ItemMargin">10 0 10 0</Thickness>
152+
<Thickness x:Key="ResultMargin">0 0 0 10</Thickness>
153+
<Style
154+
x:Key="ClockPanel"
155+
BasedOn="{StaticResource ClockPanel}"
156+
TargetType="{x:Type StackPanel}">
157+
<Setter Property="Margin" Value="0 0 54 0" />
136158
</Style>
137159
<Style
138160
x:Key="ClockBox"
139161
BasedOn="{StaticResource BaseClockBox}"
140162
TargetType="{x:Type TextBlock}">
141-
<Setter Property="Foreground" Value="#787878" />
163+
<Setter Property="Foreground" Value="#6f737a" />
142164
</Style>
143165
<Style
144166
x:Key="DateBox"
145167
BasedOn="{StaticResource BaseDateBox}"
146168
TargetType="{x:Type TextBlock}">
147-
<Setter Property="Foreground" Value="#787878" />
169+
<Setter Property="Foreground" Value="#6f737a" />
148170
</Style>
149171
<Style
150172
x:Key="PreviewBorderStyle"
151173
BasedOn="{StaticResource BasePreviewBorderStyle}"
152174
TargetType="{x:Type Border}">
153-
<Setter Property="BorderBrush" Value="#474747" />
175+
<Setter Property="Margin" Value="0 0 10 8" />
176+
<Setter Property="BorderBrush" Value="#393b40" />
154177
</Style>
155-
156178
<Style
157179
x:Key="PreviewItemTitleStyle"
158180
BasedOn="{StaticResource BasePreviewItemTitleStyle}"
159181
TargetType="{x:Type TextBlock}">
160-
<Setter Property="Foreground" Value="#ebebeb" />
182+
<Setter Property="Foreground" Value="#6f737a" />
161183
</Style>
162184
<Style
163185
x:Key="PreviewItemSubTitleStyle"
164186
BasedOn="{StaticResource BasePreviewItemSubTitleStyle}"
165187
TargetType="{x:Type TextBlock}">
166-
<Setter Property="Foreground" Value="#787878" />
188+
<Setter Property="Foreground" Value="#6f737a" />
167189
</Style>
168190
<Style
169191
x:Key="PreviewGlyph"
170192
BasedOn="{StaticResource BasePreviewGlyph}"
171193
TargetType="{x:Type TextBlock}">
172-
<Setter Property="Foreground" Value="#ebebeb" />
194+
<Setter Property="Foreground" Value="#dfe1e5" />
173195
</Style>
174-
</ResourceDictionary>
196+
</ResourceDictionary>

0 commit comments

Comments
 (0)