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

Commit d0a1cd8

Browse files
committed
Make publish view consistent with Azure DevOps
Use same colors and layout.
1 parent 3bf04a5 commit d0a1cd8

File tree

3 files changed

+74
-7
lines changed

3 files changed

+74
-7
lines changed
Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
namespace GitHub.VisualStudio
1+
using System;
2+
using Microsoft.VisualStudio.Imaging.Interop;
3+
4+
namespace GitHub.VisualStudio
25
{
3-
internal class Images
6+
public class Images
47
{
58
internal const string ImageMonikerGuid = "{de556d01-f3bc-4521-abc3-3e04b537f9c9}";
6-
internal const int Logo = 1;
9+
internal const int LogoId = 1;
10+
11+
public static ImageMoniker Logo { get; } = new ImageMoniker { Guid = new Guid(ImageMonikerGuid), Id = LogoId };
712
}
813
}

src/GitHub.VisualStudio.16/StartPagePackage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace GitHub.StartPage
1212
[ProvideBindingPath(SubPath = "UI")]
1313
[PackageRegistration(UseManagedResourcesOnly = true)]
1414
[Guid(Guids.StartPagePackageId)]
15-
[ProvideCodeContainerProvider("GitHub Container", Guids.StartPagePackageId, Images.ImageMonikerGuid, Images.Logo, "#110", "#111", typeof(InBoxGitHubContainerProvider))]
15+
[ProvideCodeContainerProvider("GitHub Container", Guids.StartPagePackageId, Images.ImageMonikerGuid, Images.LogoId, "#110", "#111", typeof(InBoxGitHubContainerProvider))]
1616
public sealed class StartPagePackage : ExtensionPointPackage
1717
{
1818
protected override ICodeContainerProvider CreateCodeContainerProvider(Guid provider)

src/GitHub.VisualStudio.16/Sync/PublishView.xaml

Lines changed: 65 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,74 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
7+
xmlns:mtcw="clr-namespace:Microsoft.TeamFoundation.Controls.WPF;assembly=Microsoft.TeamFoundation.Controls"
8+
xmlns:local="clr-namespace:GitHub.VisualStudio;assembly="
69
mc:Ignorable="d"
710
d:DesignHeight="300" d:DesignWidth="300"
811
DataContext="{Binding RelativeSource={RelativeSource Self}}">
912

10-
<WrapPanel HorizontalAlignment="Right" Margin="0,0,14,0">
11-
<Button Content="Publish Git Repo" />
12-
</WrapPanel>
13+
<UserControl.Resources>
14+
<SolidColorBrush
15+
x:Key="SubduedTextBrushKey"
16+
Color="{Binding Source={x:Static mtcw:TeamFoundationColors.Instance}, Path=SubduedTextColor, Mode=OneWay}" />
17+
</UserControl.Resources>
18+
19+
<StackPanel Margin="6,0,0,0">
20+
21+
<!-- heading -->
22+
<Grid Margin="6,6,6,5">
23+
<Grid.ColumnDefinitions>
24+
<ColumnDefinition Width="Auto" />
25+
<ColumnDefinition Width="*" />
26+
</Grid.ColumnDefinitions>
27+
28+
<!--Icon -->
29+
<imaging:CrispImage
30+
Width="32"
31+
Height="32"
32+
Grid.Column="0"
33+
HorizontalAlignment="Center"
34+
VerticalAlignment="Top"
35+
Margin="0,2,8,2"
36+
SnapsToDevicePixels="True"
37+
Visibility="Visible"
38+
Moniker="{x:Static local:Images.Logo}" />
39+
40+
<!--Service name, provider -->
41+
<StackPanel Orientation="Vertical"
42+
VerticalAlignment="Center"
43+
Grid.Column="1">
44+
<TextBlock x:Name="Name" Text="GitHub" TextTrimming="CharacterEllipsis" FontWeight="SemiBold" />
45+
<TextBlock x:Name="Provider" Text="GitHub, Inc" TextTrimming="CharacterEllipsis"
46+
Foreground="{StaticResource SubduedTextBrushKey}" />
47+
</StackPanel>
48+
</Grid>
49+
50+
<Grid x:Name="GetStartedGrid" x:Uid="GetStartedGrid">
51+
<Grid.ColumnDefinitions>
52+
<ColumnDefinition Width="Auto"/>
53+
<ColumnDefinition Width="*"/>
54+
</Grid.ColumnDefinitions>
55+
<Grid.RowDefinitions>
56+
<RowDefinition Height="Auto"/>
57+
<RowDefinition Height="*"/>
58+
</Grid.RowDefinitions>
59+
<WrapPanel x:Name="GetStartedPanel" Grid.Row="0" Grid.ColumnSpan="2">
60+
<!-- Description text -->
61+
<TextBlock x:Name="Description"
62+
x:Uid="Description"
63+
Text="Powerful collaboration, code review, and code management for open source and private projects."
64+
MaxHeight="100"
65+
TextWrapping="Wrap"
66+
TextTrimming="WordEllipsis" />
67+
</WrapPanel>
68+
<WrapPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,14,0">
69+
<Button x:Uid="publishARepoButton" x:Name="publishARepoButton"
70+
Grid.Column="0" Content="Publish to GitHub" />
71+
</WrapPanel>
72+
</Grid>
73+
74+
</StackPanel>
1375

1476
</UserControl>

0 commit comments

Comments
 (0)