Skip to content

Commit 7fafdb4

Browse files
authored
Merge branch 'dev' into FixAppContextMenu
2 parents 77624e7 + 54ded84 commit 7fafdb4

File tree

11 files changed

+0
-11
lines changed

11 files changed

+0
-11
lines changed

Flow.Launcher/ActionKeywords.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<TextBlock
5959
Grid.Column="0"
6060
Margin="0,0,0,0"
61-
FontFamily="Segoe UI"
6261
FontSize="20"
6362
FontWeight="SemiBold"
6463
Text="{DynamicResource actionKeywordsTitle}"

Flow.Launcher/CustomQueryHotkeySetting.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<TextBlock
6565
Grid.Column="0"
6666
Margin="0,0,0,0"
67-
FontFamily="Segoe UI"
6867
FontSize="20"
6968
FontWeight="SemiBold"
7069
Text="{DynamicResource customeQueryHotkeyTitle}"

Flow.Launcher/PriorityChangeWindow.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
<TextBlock
6464
Grid.Column="0"
6565
Margin="0,0,0,0"
66-
FontFamily="Segoe UI"
6766
FontSize="20"
6867
FontWeight="SemiBold"
6968
Text="{DynamicResource changePriorityWindow}"

Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
</Style>
3030
<Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">
3131
<Setter Property="FontSize" Value="14" />
32-
<Setter Property="FontFamily" Value="Segoe UI" />
3332
<Setter Property="VerticalAlignment" Value="Center" />
3433
<Setter Property="Foreground" Value="{DynamicResource Color05B}" />
3534
</Style>

Flow.Launcher/SelectBrowserWindow.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<TextBlock
6363
Grid.Column="0"
6464
Margin="0,0,0,0"
65-
FontFamily="Segoe UI"
6665
FontSize="20"
6766
FontWeight="SemiBold"
6867
Text="{DynamicResource defaultBrowserTitle}"

Flow.Launcher/SelectFileManagerWindow.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
<TextBlock
6363
Grid.Column="0"
6464
Margin="0,0,0,0"
65-
FontFamily="Segoe UI"
6665
FontSize="20"
6766
FontWeight="SemiBold"
6867
Text="{DynamicResource fileManagerWindow}"

Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/CustomBrowserSetting.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<TextBlock
6565
Grid.Column="0"
6666
Margin="0,0,0,0"
67-
FontFamily="Segoe UI"
6867
FontSize="20"
6968
FontWeight="SemiBold"
7069
Text="{DynamicResource flowlauncher_plugin_browserbookmark_bookmarkDataSetting}"

Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@
6060
<StackPanel Margin="0,0,0,12">
6161
<TextBlock
6262
Margin="0,0,0,0"
63-
FontFamily="Segoe UI"
6463
FontSize="20"
6564
FontWeight="SemiBold"
6665
Text="{DynamicResource plugin_explorer_manageactionkeywords_header}"

Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<TextBlock
5959
Grid.Column="0"
6060
Margin="0,0,0,0"
61-
FontFamily="Segoe UI"
6261
FontSize="20"
6362
FontWeight="SemiBold"
6463
Text="{DynamicResource flowlauncher_plugin_program_directory}"

Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
<TextBlock
6060
Grid.Column="0"
6161
Margin="0,0,0,0"
62-
FontFamily="Segoe UI"
6362
FontSize="20"
6463
FontWeight="SemiBold"
6564
Text="{DynamicResource flowlauncher_plugin_program_suffixes}"

0 commit comments

Comments
 (0)