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

Commit d0bcd9b

Browse files
committed
Make SSO login link look a bit nicer.
1 parent f506e42 commit d0bcd9b

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<ResourceDictionary.MergedDictionaries>
2222
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
2323
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
24+
<cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
2425
</ResourceDictionary.MergedDictionaries>
2526
</ResourceDictionary>
2627
</Control.Resources>
@@ -100,6 +101,22 @@
100101

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

104+
<Grid Margin="0 8">
105+
<Grid.ColumnDefinitions>
106+
<ColumnDefinition Width="*"/>
107+
<ColumnDefinition Width="Auto"/>
108+
<ColumnDefinition Width="*"/>
109+
</Grid.ColumnDefinitions>
110+
<Rectangle Grid.Column="0" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
111+
<TextBlock Grid.Column="1" Margin="8,0,8,4">or</TextBlock>
112+
<Rectangle Grid.Column="2" Fill="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}" Height="1"/>
113+
</Grid>
114+
115+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
116+
<ui:GitHubActionLink x:Name="dotComSsaLogInButton">Sign in with your browser</ui:GitHubActionLink>
117+
<ui:OcticonImage Icon="link_external" Margin="0 1 0 0"/>
118+
</StackPanel>
119+
103120
<uirx:UserErrorMessages x:Name="dotComErrorMessage" Margin="0,10">
104121
</uirx:UserErrorMessages>
105122

@@ -110,9 +127,7 @@
110127
<uirx:ValidationMessage
111128
x:Name="dotComPasswordValidationMessage"
112129
ValidatesControl="{Binding ElementName=dotComPassword}" />
113-
114-
<ui:GitHubActionLink x:Name="dotComSsaLogInButton">Login with your browser</ui:GitHubActionLink>
115-
130+
116131
</StackPanel>
117132
</StackPanel>
118133
</DockPanel>

src/GitHub.VisualStudio/UI/WindowController.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
xmlns:pfui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
1010
Title="GitHub"
1111
Width="414"
12-
Height="440"
12+
Height="460"
1313
MinWidth="414"
14-
MinHeight="440"
14+
MinHeight="460"
1515
Background="White"
1616
FontFamily="Segoe UI"
1717
FontSize="12"

0 commit comments

Comments
 (0)