From d2d38c3a460af20441eb8d222c149691f81e0dfe Mon Sep 17 00:00:00 2001 From: Simon Davies Date: Mon, 30 Sep 2024 16:34:03 +0100 Subject: [PATCH] Collection page header styling (#2105) * WIP restyle of collection header can't get the main chunk to stay left! * sort of fixed * updated comments * re-enabled background image and design tweaks dark linear gradient been added text tweaks from @captainsandypants --- .../CollectionDownloadView.axaml | 118 +++++++------ .../CollectionDownloadView.axaml.cs | 8 +- .../Styles/StylesIndex.axaml | 2 +- .../CollectionDownloadPage.axaml | 90 ---------- .../CollectionDownloadPageStyles.axaml | 166 ++++++++++++++++++ 5 files changed, 236 insertions(+), 148 deletions(-) delete mode 100644 src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPage.axaml create mode 100644 src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPageStyles.axaml diff --git a/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml b/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml index 2e5ebca6e0..0fd2a97f08 100644 --- a/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml +++ b/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml @@ -1,5 +1,5 @@ - - + @@ -48,59 +48,74 @@ - - - - - - - - - COLLECTION DOWNLOAD - - - - - + + + + + + + + + + + + + + COLLECTION DOWNLOAD + + + + + + + + + + - - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + @@ -122,4 +137,3 @@ - diff --git a/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml.cs b/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml.cs index d113bd5f75..9cf1bcf580 100644 --- a/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml.cs +++ b/src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml.cs @@ -15,19 +15,17 @@ public CollectionDownloadView() { // Uncomment this to enable the background image - /* this.WhenAnyValue(view => view.ViewModel!.BackgroundImage) .WhereNotNull() - .SubscribeWithErrorLogging(image => Body.Background = new ImageBrush { Source = image }) + .SubscribeWithErrorLogging(image => Body.Background = new ImageBrush { Source = image, Stretch = Stretch.UniformToFill}) .DisposeWith(d); - */ this.WhenAnyValue(view => view.ViewModel!.TileImage) .WhereNotNull() - .SubscribeWithErrorLogging(image => Image38.Source = image) + .SubscribeWithErrorLogging(image => CollectionImage.Source = image) .DisposeWith(d); - this.OneWayBind(ViewModel, vm => vm.Name, view => view.Title.Text) + this.OneWayBind(ViewModel, vm => vm.Name, view => view.Heading.Text) .DisposeWith(d); this.OneWayBind(ViewModel, vm => vm.AuthorName, view => view.AuthorName.Text) diff --git a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/StylesIndex.axaml b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/StylesIndex.axaml index 6537664d20..9d4bc87292 100644 --- a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/StylesIndex.axaml +++ b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/StylesIndex.axaml @@ -31,7 +31,7 @@ - + diff --git a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPage.axaml b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPage.axaml deleted file mode 100644 index 11ad5d4306..0000000000 --- a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPage.axaml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPageStyles.axaml b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPageStyles.axaml new file mode 100644 index 0000000000..73a21923f5 --- /dev/null +++ b/src/Themes/NexusMods.Themes.NexusFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPageStyles.axaml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +