Skip to content

Commit

Permalink
sort of fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@insomnious
insomnious committed Sep 26, 2024
1 parent 7979125 commit 2c207c6
Show file tree
Hide file tree
Showing 2 changed files with 67 additions and 59 deletions.
42 changes: 22 additions & 20 deletions src/NexusMods.App.UI/Pages/CollectionDownload/CollectionDownloadView.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,30 +52,32 @@
<Border x:Name="HeaderBorder">
<panels:FlexPanel x:Name="Header">

<Border x:Name="MainContentBorder">
<panels:FlexPanel x:Name="MainContent">


<Border x:Name="CollectionImageBorder">
<Image x:Name="CollectionImage" />
</Border>
<Border x:Name="MainContentBorder">
<panels:FlexPanel x:Name="MainContent">

<panels:FlexPanel x:Name="CollectionDetails">
<TextBlock Classes="TitleSMSemi">COLLECTION DOWNLOAD</TextBlock>
<TextBlock x:Name="Title" Classes="HeadingSMSemi" />
<Border x:Name="TagsPanelBorder">
<panels:FlexPanel x:Name="TagsPanel">
<TextBlock x:Name="Revision" />
<Border x:Name="AuthorAvatarBorder">
<Image x:Name="AuthorAvatar" />
</Border>
</panels:FlexPanel>
<Border x:Name="CollectionImageBorder">
<Image x:Name="CollectionImage" />
</Border>
<TextBlock x:Name="AuthorName" />
<TextBlock x:Name="Summary" />
</panels:FlexPanel>

</panels:FlexPanel>
</Border>
<panels:FlexPanel x:Name="CollectionDetails">
<TextBlock Classes="TitleSMSemi">COLLECTION DOWNLOAD</TextBlock>
<TextBlock x:Name="Title" Classes="HeadingSMSemi" />
<Border x:Name="TagsPanelBorder">
<panels:FlexPanel x:Name="TagsPanel">
<TextBlock x:Name="Revision" />
<Border x:Name="AuthorAvatarBorder">
<Image x:Name="AuthorAvatar" />
</Border>
</panels:FlexPanel>
</Border>
<TextBlock x:Name="AuthorName" />
<TextBlock x:Name="Summary" />
</panels:FlexPanel>

</panels:FlexPanel>
</Border>

<Border x:Name="StatsBorder">
<panels:FlexPanel x:Name="Stats" IsVisible="True">
Expand Down
84 changes: 45 additions & 39 deletions ...sFluentDark/Styles/UserControls/CollectionDownloadPage/CollectionDownloadPageStyles.axaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:collections="clr-namespace:NexusMods.App.UI.Pages.CollectionDownload;assembly=NexusMods.App.UI"
xmlns:icons="clr-namespace:NexusMods.Icons;assembly=NexusMods.Icons">
<Design.PreviewWith>
<Grid Width="1400" Height="600">
<Grid Width="1000" Height="600">
<Grid.Resources>
<collections:CollectionDownloadDesignViewModel x:Key="CollectionDownloadPageDesignViewModel" />
</Grid.Resources>
Expand All @@ -14,64 +14,70 @@

<Style Selector="collections|CollectionDownloadView">
<Style Selector="^ panels|FlexPanel#Body">
<Setter Property="Background" Value="#101020" />
<!-- <Setter Property="Background" Value="#101020" /> -->
<Setter Property="Direction" Value="Column" />
<Setter Property="AlignItems" Value="FlexStart" />

<Style Selector="^ Border#HeaderBorder">
<Setter Property="panels:Flex.AlignSelf" Value="Stretch" />
<Setter Property="Background" Value="#202030" />
<!-- <Setter Property="Background" Value="DarkGreen" /> -->
<Setter Property="Padding" Value="24,24,24,16" />

<Style Selector="^ panels|FlexPanel#Header">
<!-- <Setter Property="Background" Value="#252535" /> -->
<Setter Property="Direction" Value="Column" />
<Setter Property="AlignItems" Value="FlexStart" />
<Setter Property="AlignItems" Value="Stretch" />
<Setter Property="JustifyContent" Value="FlexStart" />

<Style Selector="^ Border#MainContentBorder">
<Setter Property="Background" Value="DarkRed" />
<Setter Property="MaxWidth" Value="806" />
<Setter Property="panels:Flex.AlignSelf" Value="Stretch" />
<Setter Property="Padding" Value="0, 0, 0, 24" />

<Style Selector="^ panels|FlexPanel#MainContent">
<Setter Property="Direction" Value="Row" />
<!-- some weird stuff happening here with max width and backgrounds-->
<Style Selector="^ Border#MainContentBorder">
<!-- <Setter Property="Background" Value="DarkRed" /> -->
<Setter Property="MaxWidth" Value="806" />
<Setter Property="Padding" Value="0, 0, 0, 24" />
<Setter Property="panels:Flex.AlignSelf" Value="FlexStart" />
<!-- <Setter Property="HorizontalAlignment" Value="Left" /> -->

<Style Selector="^ panels|FlexPanel#MainContent">
<!-- <Setter Property="Background" Value="DarkSlateBlue" /> -->
<Setter Property="Direction" Value="Row" />

<!-- left column -->
<Style Selector="^ Border#CollectionImageBorder">
<Setter Property="CornerRadius" Value="{StaticResource Rounded}" />
<Setter Property="ClipToBounds" Value="True" />
<!-- left column -->
<Style Selector="^ Border#CollectionImageBorder">
<Setter Property="CornerRadius" Value="{StaticResource Rounded}" />
<Setter Property="ClipToBounds" Value="True" />

<!-- NOTE(insomnious): not sure if we fixed sizes on both elements, but figma does -->
<Setter Property="Width" Value="154" />
<Setter Property="Height" Value="190" />
<Style Selector="^ Image#CollectionImage">
<!-- NOTE(insomnious): not sure if we fixed sizes on both elements, but figma does -->
<Setter Property="Width" Value="154" />
<Setter Property="Height" Value="190" />
<Style Selector="^ Image#CollectionImage">
<Setter Property="Width" Value="154" />
<Setter Property="Height" Value="190" />
</Style>
</Style>
</Style>

<!-- right column -->
<Style Selector="^ panels|FlexPanel#CollectionDetails">
<Setter Property="Margin" Value="24, 0" />
<!-- <Setter Property="Background" Value="#404050" /> -->
<Setter Property="Direction" Value="Column" />
<Setter Property="RowSpacing" Value="4" />
<Setter Property="panels:Flex.Grow" Value="1" />
<Setter Property="panels:Flex.Shrink" Value="0" />
<Setter Property="panels:Flex.Basis" Value="0" />

<Style Selector="^ Border#TagsPanelBorder">
<Setter Property="BorderThickness" Value="0, 1, 0, 1" />
<Setter Property="BorderBrush" Value="{StaticResource StrokeTranslucentWeakBrush}" />
<!-- right column -->
<Style Selector="^ panels|FlexPanel#CollectionDetails">
<Setter Property="Margin" Value="24, 0" />
<!-- <Setter Property="Background" Value="#404050" /> -->
<Setter Property="Direction" Value="Column" />
<Setter Property="RowSpacing" Value="4" />
<Setter Property="panels:Flex.Grow" Value="1" />
<Setter Property="panels:Flex.Shrink" Value="0" />
<Setter Property="panels:Flex.Basis" Value="0" />

<Style Selector="^ Border#TagsPanelBorder">
<Setter Property="BorderThickness" Value="0, 1, 0, 1" />
<Setter Property="BorderBrush"
Value="{StaticResource StrokeTranslucentWeakBrush}" />
</Style>

<Style Selector="^ TextBlock#Summary">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
</Style>
</Style>

<Style Selector="^ TextBlock#Summary">
<Setter Property="TextWrapping" Value="Wrap" />
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
</Style>
</Style>

</Style>
</Style>

Expand Down

0 comments on commit 2c207c6

Please sign in to comment.