Optimize design

daniel-lerch · Sep 4, 2024 · 340b0a4 · 340b0a4
1 parent c3d9d8c
commit 340b0a4
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 25 deletions.
diff --git a/src/Vocup/Views/AboutView.axaml b/src/Vocup/Views/AboutView.axaml
@@ -12,24 +12,38 @@
     <vm:AboutViewModel />
   </Design.DataContext>
 
+  <UserControl.Styles>
+    <Style Selector="Grid.properties HyperlinkButton">
+      <Setter Property="CornerRadius" Value="0" />
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Margin" Value="12,4,4,4" />
+    </Style>
+    <Style Selector="Grid.properties HyperlinkButton:pointerover /template/ ContentPresenter#PART_ContentPresenter">
+      <Setter Property="Background" Value="Transparent" />
+    </Style>
+    <Style Selector="Grid.properties TextBlock">
+      <Setter Property="Margin" Value="4,4,12,4" />
+    </Style>
+  </UserControl.Styles>
+
   <ScrollViewer>
-    <StackPanel>
+    <StackPanel Grid.IsSharedSizeScope="True">
       <Image Source="/Assets/legacy-rectangle-logo.png" Width="248" Margin="8" />
       <TextBlock Text="{Binding Version}" FontWeight="SemiBold" TextAlignment="Center" Margin="8" />
       <TextBlock Text="{Binding Copyright}" TextAlignment="Center" TextWrapping="Wrap" Margin="8" />
-      <Grid Margin="8" HorizontalAlignment="Center">
+      <Grid Margin="4" Classes="properties" HorizontalAlignment="Center">
         <Grid.RowDefinitions>
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-          <ColumnDefinition Width="Auto" />
-          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition SharedSizeGroup="A" Width="*" />
+          <ColumnDefinition SharedSizeGroup="B" Width="*" />
         </Grid.ColumnDefinitions>
 
-        <TextBlock Grid.Row="0" Text="{x:Static lang:Resources.AboutView_License}" />
+        <TextBlock Grid.Row="0" Margin="4" Text="{x:Static lang:Resources.AboutView_License}" />
         <HyperlinkButton Grid.Row="0" Grid.Column="1" Content="AGPL-3.0" NavigateUri="https://github.com/daniel-lerch/vocup/blob/master/LICENSE" />
         <TextBlock Grid.Row="1" Text="{x:Static lang:Resources.AboutView_SourceCode}" />
         <HyperlinkButton Grid.Row="1" Grid.Column="1" Content="{x:Static lang:Resources.AboutView_VocupOnGithub}" NavigateUri="https://github.com/daniel-lerch/vocup" />

diff --git a/src/Vocup/Views/LicensesControl.axaml b/src/Vocup/Views/LicensesControl.axaml
@@ -21,30 +21,30 @@
     </Style>
   </UserControl.Styles>
 
-  <ItemsControl ItemsSource="{Binding Components}" Grid.IsSharedSizeScope="True">
+  <ItemsControl ItemsSource="{Binding Components}">
     <ItemsControl.ItemTemplate>
       <DataTemplate>
-        <Border Padding="4">
-          <Grid>
-            <Grid.ColumnDefinitions>
-              <ColumnDefinition SharedSizeGroup="A" />
-              <ColumnDefinition SharedSizeGroup="B"/>
-            </Grid.ColumnDefinitions>
-            <HyperlinkButton
-              Grid.Column="0"
-              Classes="link"
-              Content="{Binding Name}"
-              NavigateUri="{Binding Url}"
-              ToolTip.Tip="{Binding Url}"
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition SharedSizeGroup="A" />
+            <ColumnDefinition SharedSizeGroup="B"/>
+          </Grid.ColumnDefinitions>
+          <HyperlinkButton
+            Grid.Column="0"
+            Margin="4,4,12,4"
+            Classes="link"
+            Content="{Binding Name}"
+            NavigateUri="{Binding Url}"
+            ToolTip.Tip="{Binding Url}"
             />
-            <TextBlock
-              Grid.Column="1"
-              Text="{Binding License}"
-              FontSize="12"
-              VerticalAlignment="Bottom"
+          <TextBlock
+            Grid.Column="1"
+            Margin="12,4,4,4"
+            Text="{Binding License}"
+            FontSize="12"
+            VerticalAlignment="Bottom"
             />
-          </Grid>
-        </Border>
+        </Grid>
       </DataTemplate>
     </ItemsControl.ItemTemplate>
   </ItemsControl>