Demo cleanup (#2202)

* Fix DotSettings file name

Also added some naming rules that match current style

* Sorted demo pages & optimized page search

* Removed nested ScrollViewers and improved margins

Author: jizc

MainDemo.Wpf/Buttons.xaml

@@ -51,7 +51,7 @@
         <StackPanel Grid.Row="1">
             <StackPanel
                 Orientation="Horizontal"
-                Margin="0 24 0 0">
+                Margin="0 16 0 0">
 
                 <StackPanel.Resources>
                     <system:Double x:Key="IconSize">24</system:Double>
@@ -374,10 +374,10 @@
             </StackPanel>
         </StackPanel>
 
-        <Border
+        <Rectangle
             Margin="0 24 0 0"
-            BorderThickness="0 1 0 0"
-            BorderBrush="{DynamicResource MaterialDesignDivider}"
+            Height="1"
+            Fill="{DynamicResource MaterialDesignDivider}"
             Grid.Row="2" />
 
         <TextBlock
@@ -443,11 +443,12 @@
                 </Grid>
             </smtx:XamlDisplay>            
         </StackPanel>
-        
-        <Border
+
+        <Rectangle
             Margin="0 24 0 0"
-            BorderThickness="0 1 0 0"
-            BorderBrush="{DynamicResource MaterialDesignDivider}" Grid.Row="5" />
+            Height="1"
+            Fill="{DynamicResource MaterialDesignDivider}"
+            Grid.Row="5" />
 
         <TextBlock
             Style="{StaticResource MaterialDesignHeadline5TextBlock}"
@@ -583,11 +584,11 @@
                 </smtx:XamlDisplay>
             </StackPanel>
         </StackPanel>
-        
-        <Border
+
+        <Rectangle
             Margin="0 24 0 0"
-            BorderThickness="0 1 0 0"
-            BorderBrush="{DynamicResource MaterialDesignDivider}"
+            Height="1"
+            Fill="{DynamicResource MaterialDesignDivider}"
             Grid.Row="8" />
 
         <TextBlock

MainDemo.Wpf/Cards.xaml

@@ -23,7 +23,7 @@
     <WrapPanel Margin="0 0 8 8">
         <smtx:XamlDisplay
             UniqueKey="cards_1"
-            Margin="4 4 0 0"
+            Margin="4 4 0 16"
             VerticalContentAlignment="Top">
             <materialDesign:Card Width="200">
                 <Grid>
@@ -85,7 +85,7 @@
 
         <smtx:XamlDisplay
             UniqueKey="cards_2"
-            Margin="4 4 0 0"
+            Margin="4 4 0 16"
             VerticalContentAlignment="Top">
             <materialDesign:Card Width="220">
                 <Grid>
@@ -192,7 +192,7 @@
         <StackPanel>
             <smtx:XamlDisplay
                 UniqueKey="cards_3"
-                Margin="4 4 0 0"
+                Margin="4 4 0 16"
                 VerticalContentAlignment="Top">
                 <materialDesign:Card Background="#03a9f4"
                       Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
@@ -248,7 +248,7 @@
 
             <smtx:XamlDisplay
                 UniqueKey="cards_4"
-                Margin="4 4 0 0"
+                Margin="4 4 0 16"
                 VerticalContentAlignment="Top">
                 <materialDesign:Card Background="{DynamicResource PrimaryHueLightBrush}"
                       Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
@@ -262,7 +262,7 @@
 
             <smtx:XamlDisplay
                 UniqueKey="cards_5"
-                Margin="4 4 0 0">
+                Margin="4 4 0 16">
                 <materialDesign:Card
                     Background="{DynamicResource PrimaryHueDarkBrush}"
                     Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
@@ -278,7 +278,7 @@
 
         <smtx:XamlDisplay
             UniqueKey="cards_6"
-            Margin="4 4 0 0"
+            Margin="4 4 0 16"
             VerticalContentAlignment="Top">
             <materialDesign:Card
                 Background="{DynamicResource PrimaryHueDarkBrush}"