Finesse some margin glyph stuff

Author: donokuda

src/GitHub.InlineReviews/Tags/AddInlineCommentGlyph.xaml

@@ -6,28 +6,9 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d">
 
-    <!-- Resources are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml (and Properties\DesignTimeResources.xaml) -->
-    <UserControl.Style>
-        <Style TargetType="UserControl">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding DiffChangeType}" Value="Add">
-                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Add}" />
-                </DataTrigger>
-
-                <DataTrigger Binding="{Binding DiffChangeType}" Value="Delete">
-                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Delete}" />
-                </DataTrigger>
-
-                <DataTrigger Binding="{Binding DiffChangeType}" Value="None">
-                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.None}" />
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-    </UserControl.Style>
-
     <Grid>
         <Border Background="{DynamicResource GitHubGlyphMarginCommentableBackground}" BorderThickness="0,0,1,0" />
-        <Viewbox x:Name="AddViewbox" Margin="1,1,0,0">
+        <Viewbox x:Name="AddViewbox" Margin="0,1,0,0">
             <Canvas Width="14" Height="14">
                 <Rectangle Width="13" Height="13" Fill="{DynamicResource GitHubDiffGlyphFill.None}"/>
                 <Rectangle Stroke="#313131" Fill="Transparent" Opacity="0.163" Width="13" Height="13" />

src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml

@@ -6,27 +6,9 @@
              xmlns:cache="clr-namespace:GitHub.UI.Helpers;assembly=GitHub.UI"
              mc:Ignorable="d">
 
-    <!-- Resources are defined in \GitHub.VisualStudio.UI\Styles\Theme*.xaml (and Properties\DesignTimeResources.xaml) -->
-    <UserControl.Style>
-        <Style TargetType="UserControl">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding DiffChangeType}" Value="Add">
-                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Add}" />
-                </DataTrigger>
-
-                <DataTrigger Binding="{Binding DiffChangeType}" Value="Delete">
-                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.Delete}" />
-                </DataTrigger>
-
-                <DataTrigger Binding="{Binding DiffChangeType}" Value="None">
-                    <Setter Property="Background" Value="{DynamicResource GitHubDiffChangeBackground.None}" />
-                </DataTrigger>
-            </Style.Triggers>
-        </Style>
-    </UserControl.Style>
-
-    <Grid Background="{DynamicResource GitHubGlyphMarginCommentableBackground}">
-        <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
+    <Grid>
+            <Border Background="{DynamicResource GitHubGlyphMarginCommentableBackground}" BorderThickness="0,0,1,0" />
+            <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center"  Margin="0,1,0,0">
             <Canvas Width="16" Height="15">
                 <Path Canvas.Top="1" Canvas.Left="0.85"
                     Data="M1,0 C0.45,0 0,0.45 0,1 L0,9 C0,9.55 0.45,10 1,10 L3,10 L3,13.5 L6.5,10 L13,10 C13.55,10 14,9.55 14,9 L14,1 C14,0.45 13.55,0 13,0 L1,0 Z" />