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

Merge dev for fix conflict

Browse source
This commit is contained in:
DB p 2021-11-05 10:12:35 +09:00
parent 09992fa9df
commit 6498c6bd53
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Flow.Launcher/SettingWindow.xaml
View file

@ -1114,7 +1114,7 @@
</TextBlock>
</ItemsControl>
</Border>
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 18">
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Text="{DynamicResource windowWidthSize}" Style="{DynamicResource SettingTitleLabel}"/>
@ -1131,7 +1131,7 @@
</StackPanel>
<StackPanel Grid.Row="3">
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 8 0 0" Padding="0"
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0" Padding="0"
HorizontalAlignment="Stretch">
<ListBox ItemsSource="{Binding Themes}" SelectedItem="{Binding SelectedTheme}"
ui:ScrollViewerHelper.AutoHideScrollBars="True"