Merge pull request CommunityToolkit#92 from CommunityToolkit/niels900…

…1/margin-fixes Niels9001/ UX tweaks
humbertomoli99 · Jul 25, 2022 · 9b1a3b9 · 9b1a3b9
2 parents 63d94e5 + 1f2aea9
commit 9b1a3b9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/samples/MvvmSampleUwp/Controls/DocumentationBlock.xaml b/samples/MvvmSampleUwp/Controls/DocumentationBlock.xaml
@@ -13,7 +13,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="local:DocumentationBlock">
                     <Grid
-                        Padding="24,12,24,24"
+                        Padding="24,12,24,12"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         Style="{StaticResource CardStyle}">

diff --git a/samples/MvvmSampleUwp/Controls/InteractiveSample.xaml b/samples/MvvmSampleUwp/Controls/InteractiveSample.xaml
@@ -27,13 +27,13 @@
                             FontSize="22"
                             FontWeight="Normal"
                             Text="Sample" />
-                        <Pivot Grid.Row="1" Margin="14,0,0,0">
+                        <Pivot Grid.Row="1" Margin="14,0,12,12">
                             <Pivot.Resources>
                                 <FontWeight x:Key="PivotHeaderItemThemeFontWeight">SemiBold</FontWeight>
                                 <x:Double x:Key="PivotHeaderItemFontSize">14</x:Double>
                             </Pivot.Resources>
                             <PivotItem Header="Sample">
-                                <ContentPresenter Margin="0,8,0,0" Content="{TemplateBinding Content}" />
+                                <ContentPresenter Margin="0,4,0,12" Content="{TemplateBinding Content}" />
                             </PivotItem>
                             <PivotItem Header="XAML">
                                 <controls:MarkdownTextBlock
@@ -49,7 +49,7 @@
                             <PivotItem Header="C#">
                                 <controls:MarkdownTextBlock
                                     Margin="-8,4,0,0"
-                                    Padding="8"
+                                    Padding="8,8,0,0"
                                     Background="Transparent"
                                     BorderBrush="Transparent"
                                     BorderThickness="0"

diff --git a/samples/MvvmSampleUwp/Views/Widgets/ContactsListWidget.xaml b/samples/MvvmSampleUwp/Views/Widgets/ContactsListWidget.xaml
@@ -130,9 +130,10 @@
 
         <!--  Loads more contacts  -->
         <Button
-            Margin="20"
+
             HorizontalAlignment="Right"
             VerticalAlignment="Bottom"
+            Style="{StaticResource AccentButtonStyle}"
             Command="{x:Bind ViewModel.LoadMoreContactsCommand}"
             Content="Load more contacts" />
     </Grid>