Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
BlossomiShymae committed Aug 15, 2024
2 parents 1f20c5a + b0b5476 commit 0d077e3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Needlework.Net.Desktop/Needlework.Net.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<AvaloniaXamlIlDebuggerLaunch>False</AvaloniaXamlIlDebuggerLaunch>
<ApplicationIcon>app.ico</ApplicationIcon>
<AssemblyName>NeedleworkDotNet</AssemblyName>
<AssemblyVersion>0.4.0.0</AssemblyVersion>
<FileVersion>0.4.0.0</FileVersion>
<AssemblyVersion>0.4.1.0</AssemblyVersion>
<FileVersion>0.4.1.0</FileVersion>
<AvaloniaXamlVerboseExceptions>False</AvaloniaXamlVerboseExceptions>
</PropertyGroup>

Expand Down
5 changes: 2 additions & 3 deletions Needlework.Net.Desktop/Views/MainWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@
<ui:NavigationView.PaneFooter>
<StackPanel Orientation="Vertical">
<StackPanel.Styles>
<Style Selector="Button.Basic">
<Setter Property="Command" Value="{Binding OpenUrlCommand}" />
</Style>
<Style Selector="materialIcons|MaterialIcon">
<Setter Property="Width" Value="20" />
<Setter Property="Height" Value="20" />
Expand All @@ -57,6 +54,7 @@
<Button
Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://github.com/BlossomiShymae/Needlework.Net"
ToolTip.Tip="Open on GitHub."
Margin="4">
Expand All @@ -65,6 +63,7 @@
<Button
Theme="{StaticResource TransparentButton}"
VerticalAlignment="Center"
Command="{Binding OpenUrlCommand}"
CommandParameter="https://discord.gg/chEvEX5J4E"
ToolTip.Tip="Open Discord server."
Margin="4">
Expand Down

0 comments on commit 0d077e3

Please sign in to comment.