From 742496b13dfb9099d4b4ed1b9abef961878fda29 Mon Sep 17 00:00:00 2001
From: Robert <mail@rbeekman.nl>
Date: Sat, 2 Sep 2023 09:43:42 +0200
Subject: [PATCH] Workshop - UI tweaks

---
 .../Screens/Workshop/Entries/EntryListItemView.axaml         | 2 +-
 .../Screens/Workshop/Profile/ProfileDetailsView.axaml        | 3 +--
 .../SubmissionWizard/Steps/SpecificationsStepView.axaml      | 3 +--
 src/Artemis.WebClient.Workshop/Services/IWorkshopService.cs  | 5 ++---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Artemis.UI/Screens/Workshop/Entries/EntryListItemView.axaml b/src/Artemis.UI/Screens/Workshop/Entries/EntryListItemView.axaml
index 6d761081f..2831515f6 100644
--- a/src/Artemis.UI/Screens/Workshop/Entries/EntryListItemView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Entries/EntryListItemView.axaml
@@ -64,7 +64,7 @@
             </Grid>
 
             <!-- Info -->
-            <StackPanel Grid.Column="2">
+            <StackPanel Grid.Column="2" Margin="0 0 4 0">
                 <TextBlock TextAlignment="Right" Text="{CompiledBinding Entry.CreatedAt, FallbackValue=01-01-1337, Converter={StaticResource DateTimeConverter}}" />
                 <TextBlock TextAlignment="Right">
                     <avalonia:MaterialIcon Kind="Downloads" />
diff --git a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml
index f41c65768..0189b487c 100644
--- a/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/Profile/ProfileDetailsView.axaml
@@ -85,8 +85,7 @@
                     <StackPanel>
                         <TextBlock Theme="{StaticResource SubtitleTextBlockStyle}">Latest release</TextBlock>
                         <Border Classes="card-separator" />
-                        <Button CornerRadius="8" 
-                                HorizontalAlignment="Stretch" 
+                        <Button HorizontalAlignment="Stretch" 
                                 HorizontalContentAlignment="Stretch" 
                                 Command="{CompiledBinding DownloadLatestRelease}">
                             <Grid ColumnDefinitions="Auto,*">
diff --git a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml
index d83b3f225..cca75c858 100644
--- a/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml
+++ b/src/Artemis.UI/Screens/Workshop/SubmissionWizard/Steps/SpecificationsStepView.axaml
@@ -54,8 +54,7 @@
                         </Button>
                         <Border IsVisible="{CompiledBinding IconBitmap, Converter={x:Static ObjectConverters.IsNotNull}}"
                                 ClipToBounds="True"
-                                CornerRadius="12"
-                                Background="{StaticResource ControlStrokeColorOnAccentDefault}"
+                                CornerRadius="6"
                                 VerticalAlignment="Center"
                                 Width="95"
                                 Height="95">
diff --git a/src/Artemis.WebClient.Workshop/Services/IWorkshopService.cs b/src/Artemis.WebClient.Workshop/Services/IWorkshopService.cs
index 6b18e7d12..f859a4f2c 100644
--- a/src/Artemis.WebClient.Workshop/Services/IWorkshopService.cs
+++ b/src/Artemis.WebClient.Workshop/Services/IWorkshopService.cs
@@ -55,13 +55,12 @@ public class WorkshopService : IWorkshopService
             return new IWorkshopService.WorkshopStatus(false, e.Message);
         }
     }
-
-    /// <param name="cancellationToken"></param>
+    
     /// <inheritdoc />
     public async Task<bool> ValidateWorkshopStatus(CancellationToken cancellationToken)
     {
         IWorkshopService.WorkshopStatus status = await GetWorkshopStatus(cancellationToken);
-        if (!status.IsReachable)
+        if (!status.IsReachable && !cancellationToken.IsCancellationRequested)
             await _router.Navigate($"workshop/offline/{status.Message}");
         return status.IsReachable;
     }