Merge branch 'main' into release

This commit is contained in:
BlossomiShymae
2024-08-15 17:32:45 -05:00
2 changed files with 4 additions and 5 deletions

View File

@@ -11,8 +11,8 @@
<AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch> <AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch>
<ApplicationIcon>app.ico</ApplicationIcon> <ApplicationIcon>app.ico</ApplicationIcon>
<AssemblyName>NeedleworkDotNet</AssemblyName> <AssemblyName>NeedleworkDotNet</AssemblyName>
<AssemblyVersion>0.4.0.0</AssemblyVersion> <AssemblyVersion>0.4.1.0</AssemblyVersion>
<FileVersion>0.4.0.0</FileVersion> <FileVersion>0.4.1.0</FileVersion>
<AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions> <AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions>
</PropertyGroup> </PropertyGroup>

View File

@@ -43,9 +43,6 @@
<ui:NavigationView.PaneFooter> <ui:NavigationView.PaneFooter>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<StackPanel.Styles> <StackPanel.Styles>
<Style Selector="Button.Basic">
<Setter Property="Command" Value="{Binding OpenUrlCommand}" />
</Style>
<Style Selector="materialIcons|MaterialIcon"> <Style Selector="materialIcons|MaterialIcon">
<Setter Property="Width" Value="20" /> <Setter Property="Width" Value="20" />
<Setter Property="Height" Value="20" /> <Setter Property="Height" Value="20" />
@@ -57,6 +54,7 @@
<Button <Button
Theme="{StaticResource TransparentButton}" Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://github.com/BlossomiShymae/Needlework.Net" CommandParameter="https://github.com/BlossomiShymae/Needlework.Net"
ToolTip.Tip="Open on GitHub." ToolTip.Tip="Open on GitHub."
Margin="4"> Margin="4">
@@ -65,6 +63,7 @@
<Button <Button
Theme="{StaticResource TransparentButton}" Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://discord.gg/chEvEX5J4E" CommandParameter="https://discord.gg/chEvEX5J4E"
ToolTip.Tip="Open Discord server." ToolTip.Tip="Open Discord server."
Margin="4"> Margin="4">