Merge branch 'master' into fixes/1271-checkout-with-untracked-files

Author: jcansdale

install.cmd

@@ -1,4 +1,4 @@
-Configuration=%1
-@set path=%cd%\tools\VsixUtil;%path%
+@set Configuration=%1
+@if "%Configuration%" == "" echo Please specify Debug or Release
 tools\VsixUtil\vsixutil /install "build\%Configuration%\GitHub.VisualStudio.vsix"
 @echo Installed %Configuration% build of GitHub for Visual Studio

src/GitHub.InlineReviews/Tags/InlineCommentTagger.cs

@@ -1,16 +1,13 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using GitHub.Extensions;
-using GitHub.InlineReviews.Services;
 using GitHub.Logging;
 using GitHub.Models;
 using GitHub.Services;
-using GitHub.VisualStudio;
 using Microsoft.VisualStudio.Text;
 using Microsoft.VisualStudio.Text.Editor;
 using Microsoft.VisualStudio.Text.Tagging;
@@ -50,7 +47,7 @@ public InlineCommentTagger(
             this.sessionManager = sessionManager;
         }
 
-        public bool ShowMargin => file != null;
+        public bool ShowMargin => file?.Diff?.Count > 0;
 
         public event EventHandler<SnapshotSpanEventArgs> TagsChanged;
 

src/GitHub.VisualStudio.UI/Styles/SectionControl.xaml

@@ -23,21 +23,28 @@
                         <ToggleButton Grid.Column="0" Grid.Row="0" 
                                       IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                                       VerticalAlignment="Stretch"
-                                      Width="16">
+                                      Margin="0 0 4 0"
+                                      Width="10">
                             <ToggleButton.Template>
                                 <ControlTemplate TargetType="ToggleButton">
-                                    <Border Background="Transparent" >
+                                    <Border Background="Transparent">
                                         <Path Name="Arrow"
-                                              Fill="{TemplateBinding Foreground}"
+                                              Fill="{DynamicResource VsBrush.WindowText}"
+                                              Height="7"
+                                              Width="7"
+                                              Stretch="UniformToFill"
+                                              Data="M7 1l-.025 5H2z"
                                               VerticalAlignment="Center"
                                               HorizontalAlignment="Center"/>
                                     </Border>
+
                                     <ControlTemplate.Triggers>
-                                        <Trigger Property="IsChecked" Value="True">
-                                            <Setter TargetName="Arrow" Property="Data" Value="M 0 0 L 4 4 L 8 0 Z" />
-                                        </Trigger>
                                         <Trigger Property="IsChecked" Value="False">
-                                            <Setter TargetName="Arrow" Property="Data" Value="M 0 4 L 4 0 L 8 4 Z" />
+                                            <Setter TargetName="Arrow" Property="LayoutTransform">
+                                                <Setter.Value>
+                                                    <RotateTransform Angle="-45" />
+                                                </Setter.Value>
+                                            </Setter>
                                         </Trigger>
                                     </ControlTemplate.Triggers>
                                 </ControlTemplate>