From 2e6e00471326a4885d09f4ebd324a2638f8e1e2d Mon Sep 17 00:00:00 2001
From: Simon Davies <simon.davies@nexusmods.com>
Date: Thu, 27 Feb 2025 14:19:02 +0000
Subject: [PATCH] Fix for drop shadow and wrapping issues

Removed Nexus Mods
Removed inline styles
---
 .../Collections/CollectionCardView.axaml      | 12 ++------
 .../Collections/CollectionCardView.axaml.cs   |  2 +-
 .../CollectionCardStyles.axaml                | 30 +++++++++----------
 3 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml b/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml
index c92692db08..830c249597 100644
--- a/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml
+++ b/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml
@@ -25,10 +25,8 @@
             <Border x:Name="BackgroundLayerBorder">
                 <StackPanel x:Name="BackgroundLayerStack">
                     <!-- nexus mods logo -->
-                    <StackPanel x:Name="NexusModsStack">
-                        <icons:UnifiedIcon Value="{x:Static icons:IconValues.NexusColor}" />
-                        <TextBlock Text="Nexus Mods" />
-                    </StackPanel>
+                    <icons:UnifiedIcon Value="{x:Static icons:IconValues.NexusColor}"
+                                       ToolTip.Tip="Nexus Mods Collection"/>
                     <!-- revision -->
                     <StackPanel x:Name="RevisionsStack">
                         <TextBlock x:Name="RevisionText" />
@@ -50,11 +48,7 @@
                 <!-- right column -->
                 <DockPanel x:Name="DetailsDock">
                     <!-- stay at top -->
-                    <TextBlock DockPanel.Dock="Top" x:Name="TitleText"
-                               Theme="{StaticResource BodyLGBoldTheme}"
-                               Margin="0,0,0,4"
-                               TextWrapping="NoWrap"
-                               TextTrimming="CharacterEllipsis" />
+                    <TextBlock DockPanel.Dock="Top" x:Name="TitleText"/>
                     <!-- stay at bottom -->
                     <StackPanel DockPanel.Dock="Bottom" x:Name="ActionStack">
                         <navigation:NavigationControl x:Name="DownloadButton"
diff --git a/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml.cs b/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml.cs
index 2def954e87..fb4e2ff8c2 100644
--- a/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml.cs
+++ b/src/NexusMods.App.UI/Pages/LibraryPage/Collections/CollectionCardView.axaml.cs
@@ -38,7 +38,7 @@ public CollectionCardView()
             this.OneWayBind(ViewModel, vm => vm.RevisionNumber, view => view.RevisionText.Text, revision => $"Revision {revision}")
                 .DisposeWith(d);
             
-            this.OneWayBind(ViewModel, vm => vm.NumDownloads, view => view.ModsCountText.Text, count => $"{count} Mods ")
+            this.OneWayBind(ViewModel, vm => vm.NumDownloads, view => view.ModsCountText.Text, count => $"{count} Mods")
                 .DisposeWith(d);
 
             this.OneWayBind(ViewModel, vm => vm.TotalSize, view => view.TotalSize.Text)
diff --git a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionCards/CollectionCardStyles.axaml b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionCards/CollectionCardStyles.axaml
index 81fc54a82c..b69eee9870 100644
--- a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionCards/CollectionCardStyles.axaml
+++ b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionCards/CollectionCardStyles.axaml
@@ -23,41 +23,34 @@
         <Style Selector="^ Border#CardCollectionBorder">
             <Setter Property="BoxShadow" Value="{StaticResource DropShadowXS}" />
             <Setter Property="CornerRadius" Value="{StaticResource Rounded}" />
-            <Setter Property="ClipToBounds" Value="True" />
 
             <Style Selector="^ Border#BackgroundLayerBorder">
                 <Setter Property="Background" Value="{StaticResource CollectionCardLinearGradientBrush}" />
+                <Setter Property="CornerRadius" Value="4,4,0,0" />
                 <Setter Property="VerticalAlignment" Value="Top" />
                 <Setter Property="Padding" Value="16,8" />
 
                 <Style Selector="^ StackPanel#BackgroundLayerStack">
                     <Setter Property="Orientation" Value="Horizontal" />
                     <Setter Property="HorizontalAlignment" Value="Right" />
-                    <Setter Property="Spacing" Value="{StaticResource Spacing-2}" />
+                    <Setter Property="Spacing" Value="{StaticResource Spacing-1}" />
 
                     <!-- default textblock style -->
                     <Style Selector="^ TextBlock">
                         <Setter Property="Theme" Value="{StaticResource BodySMNormalTheme}" />
                         <Setter Property="Foreground" Value="{StaticResource NeutralModerateBrush}" />
                         <Setter Property="VerticalAlignment" Value="Center" />
+                        <Setter Property="TextWrapping" Value="Wrap" />
                     </Style>
 
-                    <Style Selector="^ StackPanel#NexusModsStack">
-                        <Setter Property="Theme" Value="{StaticResource BodySMNormalTheme}" />
-                        <Setter Property="Spacing" Value="{StaticResource Spacing-1}" />
-                        <Setter Property="VerticalAlignment" Value="Center" />
-                        <Setter Property="Orientation" Value="Horizontal" />
-                        <Style Selector="^ > icons|UnifiedIcon">
-                            <Setter Property="Size" Value="20" />
-                        </Style>
-                        <Style Selector="^ > TextBlock">
-                            <Setter Property="Foreground" Value="{StaticResource PrimaryStrongBrush}" />
-                        </Style>
+                    <Style Selector="^ > icons|UnifiedIcon">
+                        <Setter Property="Size" Value="20" />
                     </Style>
+                    
                     <Style Selector="^ StackPanel#RevisionsStack">
                         <Setter Property="Orientation" Value="Horizontal" />
                         <Setter Property="Spacing" Value="{StaticResource Spacing-1}" />
-                        
+
                         <Style Selector="^ StackPanel#RevisionUpdateStack">
                             <Setter Property="Orientation" Value="Horizontal" />
                             <Setter Property="Spacing" Value="{StaticResource Spacing-1}" />
@@ -100,8 +93,9 @@
                     <Style Selector="^ > TextBlock#TitleText">
                         <Setter Property="Theme" Value="{StaticResource BodyLGBoldTheme}" />
                         <Setter Property="Margin" Value="0,0,0,4" />
-                        <Setter Property="TextWrapping" Value="NoWrap" />
+                        <Setter Property="TextWrapping" Value="Wrap" />
                         <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+                        <Setter Property="MaxHeight" Value="48" />
                     </Style>
 
                     <Style Selector="^ > StackPanel#ActionStack">
@@ -118,6 +112,12 @@
                             <Setter Property="Theme" Value="{StaticResource BodySMNormalTheme}" />
                             <Setter Property="Foreground" Value="{StaticResource NeutralSubduedBrush}" />
                         </Style>
+                        
+                        <Style Selector="^ TextBlock#AuthorName">
+                            <Setter Property="MaxWidth" Value="117" />
+                            <Setter Property="TextWrapping" Value="NoWrap" />
+                            <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+                        </Style>
 
                         <Style Selector="^ Ellipse">
                             <Setter Property="Width" Value="4" />