prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Styles

Browse source
This commit is contained in:
DB p 2024-04-19 01:53:14 +09:00
parent 603d0f45ca
commit 15fe1cd643
6 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Flow.Launcher/HotkeyControl.xaml
View file

@ -35,7 +35,7 @@
FontWeight="SemiBold"
Foreground="{Binding MessageColor}"
Text="{Binding Message}"
Visibility="{Binding MessageVisibility}"/>
Visibility="{Binding MessageVisibility}" />
</Border>
</Popup>
<Grid>
@ -104,7 +104,7 @@
<Border
x:Name="ButtonBorder"
Padding="5,0,5,0"
Background="{DynamicResource Color12B}"
Background="{DynamicResource ButtonBackgroundColor}"
BorderBrush="{DynamicResource ButtonInsideBorder}"
BorderThickness="1"
CornerRadius="5">
@ -125,7 +125,7 @@
<Condition Property="IsMouseOver" Value="True" />
<Condition Property="IsChecked" Value="False" />
</MultiTrigger.Conditions>
<Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource CustomContextHover}" />
<Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMouseOver}" />
</MultiTrigger>
<MultiTrigger>
<MultiTrigger.Conditions>
@ -157,7 +157,7 @@
<Border
Margin="2,5,2,5"
Padding="10,5,10,5"
Background="{DynamicResource SystemAccentColorLight2Brush}"
Background="{DynamicResource AccentButtonBackground}"
BorderThickness="1"
CornerRadius="5">
<TextBlock Text="{Binding}" />

2
Flow.Launcher/Resources/Controls/ExCard.xaml
View file

@ -116,7 +116,7 @@
<Trigger Property="IsMouseOver" Value="true">
<Setter TargetName="circle" Property="Stroke" Value="Transparent" />
<Setter TargetName="arrow" Property="Stroke" Value="{DynamicResource Color05B}" />
<Setter TargetName="ToggleBtn" Property="Background" Value="{DynamicResource CustomContextHover}" />
<Setter TargetName="ToggleBtn" Property="Background" Value="{DynamicResource CustomExpanderHover}" />
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter TargetName="circle" Property="Stroke" Value="Transparent" />

4
Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
View file

@ -40,10 +40,10 @@
<Border
Margin="2,5,2,5"
Padding="10,5,10,5"
Background="{DynamicResource SystemAccentColorLight2Brush}"
Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
BorderThickness="1"
CornerRadius="5">
<TextBlock Text="{Binding}" />
<TextBlock Foreground="{DynamicResource AccentButtonForegroundPointerOver}" Text="{Binding}" />
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>

5
Flow.Launcher/Resources/Dark.xaml
View file

@ -104,6 +104,11 @@
<Color x:Key="NumberBoxColor26">#ffffff</Color>
<Color x:Key="HoverStoreGrid">#272727</Color>
<!-- Resources for HotkeyControl -->
<SolidColorBrush x:Key="CustomHotkeyHover" Color="#323232" />
<!-- Resources for Expander -->
<SolidColorBrush x:Key="CustomExpanderHover" Color="#323232" />
<SolidColorBrush x:Key="ButtonOutBorder" Color="Transparent" />
<SolidColorBrush x:Key="ButtonInsideBorder" Color="#3f3f3f" />

7
Flow.Launcher/Resources/Light.xaml
View file

@ -95,6 +95,13 @@
<Color x:Key="NumberBoxColor26">#1b1b1b</Color>
<Color x:Key="HoverStoreGrid">#f6f6f6</Color>
<!-- Resources for HotkeyControl -->
<SolidColorBrush x:Key="CustomHotkeyHover" Color="#f6f6f6" />
<!-- Resources for Expander -->
<SolidColorBrush x:Key="CustomExpanderHover" Color="#f6f6f6" />
<SolidColorBrush x:Key="ButtonOutBorder" Color="#e5e5e5" />
<SolidColorBrush x:Key="ButtonInsideBorder" Color="#d3d3d3" />

4
Flow.Launcher/SettingWindow.xaml
View file

@ -2721,7 +2721,7 @@
<StackPanel Grid.Row="2">
<cc:ExCard
Title="{DynamicResource basicHotkey}"
Margin="0,12,0,0"
Margin="0,14,0,0"
Icon="&#xf0e2;"
Sub="{DynamicResource basicHotkeyToolTip}">
<StackPanel>
@ -2830,7 +2830,7 @@
<cc:ExCard
Title="{DynamicResource autoCompleteHotkey}"
Margin="0,4,0,0"
Margin="0,14,0,0"
Icon="&#xe893;"
Sub="{DynamicResource autoCompleteHotkeyToolTip}">
<cc:ExCard.SideContent>