|
21 | 21 | <ResourceDictionary.MergedDictionaries> |
22 | 22 | <cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" /> |
23 | 23 | <cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" /> |
| 24 | + <cache:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" /> |
24 | 25 | </ResourceDictionary.MergedDictionaries> |
25 | 26 | </ResourceDictionary> |
26 | 27 | </Control.Resources> |
|
100 | 101 |
|
101 | 102 | <ui:SecurePasswordBox x:Name="dotComPassword" PromptText="{x:Static prop:Resources.PasswordPrompt}" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.DotcomPasswordTextBox}"/> |
102 | 103 |
|
| 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 | + |
103 | 120 | <uirx:UserErrorMessages x:Name="dotComErrorMessage" Margin="0,10"> |
104 | 121 | </uirx:UserErrorMessages> |
105 | 122 |
|
|
110 | 127 | <uirx:ValidationMessage |
111 | 128 | x:Name="dotComPasswordValidationMessage" |
112 | 129 | ValidatesControl="{Binding ElementName=dotComPassword}" /> |
113 | | - |
114 | | - <ui:GitHubActionLink x:Name="dotComSsaLogInButton">Login with your browser</ui:GitHubActionLink> |
115 | | - |
| 130 | + |
116 | 131 | </StackPanel> |
117 | 132 | </StackPanel> |
118 | 133 | </DockPanel> |
|
0 commit comments