This commit is contained in:
Jasmine Greenaway 2017-02-23 16:00:15 -05:00
Родитель bcc8714633
Коммит 139c787dd2
6 изменённых файлов: 17 добавлений и 16 удалений

Просмотреть файл

@ -4,11 +4,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs"
mc:Ignorable="d"
Width="256"
d:DesignHeight="47"
d:DesignWidth="262">
d:DesignWidth="262"
AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonInputCustom}">
<UserControl.Resources>
<Style TargetType="{x:Type TextBox}">
<Setter Property="Width" Value="36"/>
@ -19,12 +20,12 @@
<Setter Property="FontSize" Value="20px" />
</Style>
</UserControl.Resources>
<StackPanel Orientation="Horizontal" UseLayoutRounding="True" SnapsToDevicePixels="True">
<TextBox x:Name="one" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonNumberOneTextBox}" />
<TextBox x:Name="two" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonNumberTwoTextBox}" />
<TextBox x:Name="three" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonNumberThreeTextBox}" />
<TextBox x:Name="four" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonNumberFourTextBox}" />
<TextBox x:Name="five" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonNumberFiveTextBox}" />
<TextBox x:Name="six" Margin="0" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticatonNumberSixTextBox}" />
<StackPanel Orientation="Horizontal" UseLayoutRounding="True" SnapsToDevicePixels="True" AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.TwoFactorAuthenticationInputStackPanel}">
<TextBox x:Name="one" />
<TextBox x:Name="two" />
<TextBox x:Name="three" />
<TextBox x:Name="four" />
<TextBox x:Name="five" />
<TextBox x:Name="six" Margin="0" />
</StackPanel>
</UserControl>

Просмотреть файл

@ -7,13 +7,13 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
xmlns:ui="clr-namespace:GitHub.UI;assembly=GitHub.UI"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs.AutomationIDs"
Background="Beige"
d:DataContext="{d:DesignInstance Type=sampleData:InfoPanelDesigner, IsDesignTimeCreatable=True}"
d:DesignHeight="300"
d:DesignWidth="300"
mc:Ignorable="d"
AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.GitHubToolBar}">
AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.GitHubInfoPanel}">
<UserControl.Resources>
<ResourceDictionary>

Просмотреть файл

@ -8,7 +8,7 @@
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI"
xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs"
mc:Ignorable="d"
d:DesignWidth="414"
d:DesignHeight="440"

Просмотреть файл

@ -10,7 +10,7 @@
xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
xmlns:cache="clr-namespace:GitHub.VisualStudio.Helpers"
xmlns:prop="clr-namespace:GitHub.VisualStudio.UI;assembly=GitHub.VisualStudio.UI"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs"
mc:Ignorable="d"
d:DesignWidth="414"
d:DesignHeight="440"

Просмотреть файл

@ -10,13 +10,13 @@
xmlns:uirx="clr-namespace:GitHub.UI;assembly=GitHub.UI.Reactive"
xmlns:view="clr-namespace:GitHub.VisualStudio.UI.Views"
xmlns:control="clr-namespace:GitHub.VisualStudio.UI.Controls;assembly=GitHub.VisualStudio.UI"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation"
xmlns:automation="clr-namespace:GitHub.VisualStudio.TestAutomation;assembly=GitHub.VisualStudio.TestAutomation.AutomationIDs.AutomationIDs"
Background="{DynamicResource GitHubVsToolWindowBackground}"
Foreground="{DynamicResource GitHubVsToolWindowText}"
d:DesignHeight="300"
d:DesignWidth="300"
mc:Ignorable="d"
AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.GitHubToolBar}">
AutomationProperties.AutomationId="{x:Static automation:AutomationIDs.GitHubPaneView}">
<UserControl.Resources>
<ResourceDictionary>

@ -1 +1 @@
Subproject commit db4e671da27aa814eb6df5d96e492cbb42d10a52
Subproject commit e3a4c2ed78980e4a2379716062e9e4ae04c44e8a