Merge pull request #1412 from github/ui/polish-sso

Polish login view

Author: grokys

src/GitHub.VisualStudio/Views/Dialog/LoginCredentialsView.xaml

@@ -84,10 +84,6 @@
             <TabItem x:Name="dotComTab" Header="GitHub" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.SignInDotcomHostTabItem}" >
                 <DockPanel Style="{StaticResource TabDockPanel}">
                     <StackPanel DockPanel.Dock="Bottom" Margin="0">
-                        <Border Style="{StaticResource LoginButtonBorder}">
-                            <ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomSignInButton}"/>
-                        </Border>
-
                         <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveAnAccountText}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DontHaveDotcomAccountTextBlock}">
                             <Hyperlink x:Name="pricingLink" ToolTip="https://github.com/pricing"><TextBlock Text="{x:Static prop:Resources.SignUpLink}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomSignUpHyperlink}" /></Hyperlink>
                         </TextBlock>
@@ -103,15 +99,19 @@
 
                             <ui:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static prop:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomPasswordTextBox}"/>
 
+                            <Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
+                                <ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomSignInButton}"/>
+                            </Border>
+
                             <Grid Margin="0 8">
                               <Grid.ColumnDefinitions>
                                 <ColumnDefinition Width="*"/>
                                 <ColumnDefinition Width="Auto"/>
                                 <ColumnDefinition Width="*"/>
                               </Grid.ColumnDefinitions>
-                              <Rectangle Grid.Column="0" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
+                              <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
                               <TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
-                              <Rectangle Grid.Column="2" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
+                              <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
                             </Grid>
 
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
@@ -138,10 +138,6 @@
             <TabItem x:Name="enterpriseTab" Header="GitHub Enterprise" Margin="10,0,-10,0" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.SignInEnterpriseHostTabItem}">
                 <DockPanel Style="{StaticResource TabDockPanel}">
                     <StackPanel DockPanel.Dock="Bottom">
-                        <Border Style="{StaticResource LoginButtonBorder}">
-                            <ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterpriseSignInButton}"/>
-                        </Border>
-
                         <TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveGitHubEnterpriseText}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DontHaveEnterpriseTextBlock}" >
                             <Hyperlink x:Name="learnMoreLink" ToolTip="enterprise.github.com"><TextBlock Text="{x:Static prop:Resources.learnMoreLink}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterpriseLearnMoreHyperlink}"></TextBlock></Hyperlink>
                         </TextBlock>
@@ -184,16 +180,20 @@
                                                 AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterprisePasswordTextBox}" />
                         </StackPanel>
 
+                        <Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
+                            <ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterpriseSignInButton}"/>
+                        </Border>
+
                         <StackPanel Name="enterpriseSsoPanel">
                           <Grid Margin="0 8">
                             <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="*"/>
                               <ColumnDefinition Width="Auto"/>
                               <ColumnDefinition Width="*"/>
                             </Grid.ColumnDefinitions>
-                            <Rectangle Grid.Column="0" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
+                            <Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
                             <TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
-                            <Rectangle Grid.Column="2" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
+                            <Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
                           </Grid>
                           <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                             <ui:GitHubActionLink x:Name="enterpriseSsaLogInButton">Sign in with your browser</ui:GitHubActionLink>