Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 4387783

Browse files
committed
Polish login view
* Move sign-in action button closer to login fields * Adjust lines between "or" text to a lighter gray
1 parent 610dc8e commit 4387783

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@
8484
<TabItem x:Name="dotComTab" Header="GitHub" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.SignInDotcomHostTabItem}" >
8585
<DockPanel Style="{StaticResource TabDockPanel}">
8686
<StackPanel DockPanel.Dock="Bottom" Margin="0">
87-
<Border Style="{StaticResource LoginButtonBorder}">
88-
<ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomSignInButton}"/>
89-
</Border>
90-
9187
<TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveAnAccountText}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DontHaveDotcomAccountTextBlock}">
9288
<Hyperlink x:Name="pricingLink" ToolTip="https://github.com/pricing"><TextBlock Text="{x:Static prop:Resources.SignUpLink}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomSignUpHyperlink}" /></Hyperlink>
9389
</TextBlock>
@@ -103,15 +99,19 @@
10399

104100
<ui:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static prop:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomPasswordTextBox}"/>
105101

102+
<Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
103+
<ui:OcticonCircleButton x:Name="dotComLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomSignInButton}"/>
104+
</Border>
105+
106106
<Grid Margin="0 8">
107107
<Grid.ColumnDefinitions>
108108
<ColumnDefinition Width="*"/>
109109
<ColumnDefinition Width="Auto"/>
110110
<ColumnDefinition Width="*"/>
111111
</Grid.ColumnDefinitions>
112-
<Rectangle Grid.Column="0" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
112+
<Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
113113
<TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
114-
<Rectangle Grid.Column="2" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
114+
<Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
115115
</Grid>
116116

117117
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
@@ -138,10 +138,6 @@
138138
<TabItem x:Name="enterpriseTab" Header="GitHub Enterprise" Margin="10,0,-10,0" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.SignInEnterpriseHostTabItem}">
139139
<DockPanel Style="{StaticResource TabDockPanel}">
140140
<StackPanel DockPanel.Dock="Bottom">
141-
<Border Style="{StaticResource LoginButtonBorder}">
142-
<ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterpriseSignInButton}"/>
143-
</Border>
144-
145141
<TextBlock TextWrapping="Wrap" HorizontalAlignment="Center" Margin="0" Text="{x:Static prop:Resources.dontHaveGitHubEnterpriseText}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DontHaveEnterpriseTextBlock}" >
146142
<Hyperlink x:Name="learnMoreLink" ToolTip="enterprise.github.com"><TextBlock Text="{x:Static prop:Resources.learnMoreLink}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterpriseLearnMoreHyperlink}"></TextBlock></Hyperlink>
147143
</TextBlock>
@@ -184,16 +180,20 @@
184180
AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterprisePasswordTextBox}" />
185181
</StackPanel>
186182

183+
<Border Style="{StaticResource LoginButtonBorder}" Margin="0 16 0 0">
184+
<ui:OcticonCircleButton x:Name="enterpriseLogInButton" Icon="check" Content="{x:Static prop:Resources.LoginLink}" IsDefault="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.EnterpriseSignInButton}"/>
185+
</Border>
186+
187187
<StackPanel Name="enterpriseSsoPanel">
188188
<Grid Margin="0 8">
189189
<Grid.ColumnDefinitions>
190190
<ColumnDefinition Width="*"/>
191191
<ColumnDefinition Width="Auto"/>
192192
<ColumnDefinition Width="*"/>
193193
</Grid.ColumnDefinitions>
194-
<Rectangle Grid.Column="0" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
194+
<Rectangle Grid.Column="0" Fill="#FFDDDDDD" Height="1"/>
195195
<TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
196-
<Rectangle Grid.Column="2" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
196+
<Rectangle Grid.Column="2" Fill="#FFDDDDDD" Height="1"/>
197197
</Grid>
198198
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
199199
<ui:GitHubActionLink x:Name="enterpriseSsaLogInButton">Sign in with your browser</ui:GitHubActionLink>

0 commit comments

Comments
 (0)