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

Commit 303ed74

Browse files
committed
More layout tweaks and stubs for the select org view
1 parent c50f4f1 commit 303ed74

File tree

1 file changed

+48
-23
lines changed

1 file changed

+48
-23
lines changed

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

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:local="clr-namespace:GitHub.VisualStudio.Views.Dialog"
99
xmlns:sampleData="clr-namespace:GitHub.SampleData;assembly=GitHub.App"
10-
Margin="8"
1110
mc:Ignorable="d"
1211
d:DesignHeight="414" d:DesignWidth="440">
1312

@@ -24,14 +23,17 @@
2423
<sampleData:ForkRepositorySelectViewModelDesigner IsLoading="True"/>
2524
</d:DesignProperties.DataContext>
2625

27-
<Grid>
26+
<Grid Margin="0 8">
2827
<Grid.RowDefinitions>
28+
<!--
2929
<RowDefinition Height="2*"/>
30+
-->
31+
<RowDefinition Height="Auto"/>
3032
<RowDefinition Height="Auto"/>
3133
</Grid.RowDefinitions>
3234

33-
<StackPanel Grid.Row="0">
34-
<TextBlock DockPanel.Dock="Top" FontSize="16" Margin="0 8">
35+
<DockPanel Grid.Row="0">
36+
<TextBlock DockPanel.Dock="Top" FontSize="16" Margin="8">
3537
Where should we fork this repository?
3638
</TextBlock>
3739

@@ -46,12 +48,13 @@
4648
ItemsSource="{Binding Accounts}"
4749
VerticalContentAlignment="Top"
4850
HorizontalContentAlignment="Stretch"
51+
Padding="8"
52+
DockPanel.Dock="Top"
4953
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
5054
SelectionChanged="accountsListBox_SelectionChanged">
5155
<ListBox.ItemsPanel>
5256
<ItemsPanelTemplate>
53-
<UniformGrid Columns="3" IsItemsHost="True">
54-
</UniformGrid>
57+
<UniformGrid Columns="3" IsItemsHost="True" />
5558
</ItemsPanelTemplate>
5659
</ListBox.ItemsPanel>
5760
<ListBox.ItemTemplate>
@@ -72,26 +75,48 @@
7275
</DataTemplate>
7376
</ListBox.ItemTemplate>
7477
</ListBox>
75-
</StackPanel>
7678

77-
<DockPanel Grid.Row="1" Visibility="{Binding ExistingForks, Converter={ui:HasItemsVisibilityConverter}}">
78-
<TextBlock DockPanel.Dock="Top" Margin="0 8">
79-
<Run FontSize="16">Can't find what you're looking for?</Run>
80-
<LineBreak/>
81-
<Run>You have existing forks of this repository:</Run>
82-
</TextBlock>
83-
<ListBox DockPanel.Dock="Bottom" ItemsSource="{Binding ExistingForks}" MaxHeight="120">
84-
<ListBox.ItemTemplate>
85-
<DataTemplate>
86-
<StackPanel Orientation="Horizontal">
79+
<!--
80+
<DockPanel Grid.Row="1" Visibility="{Binding ExistingForks, Converter={ui:HasItemsVisibilityConverter}}">
81+
-->
82+
<DockPanel DockPanel.Dock="Bottom" Margin="0 16 0 0">
83+
<TextBlock DockPanel.Dock="Top" Margin="8 0">
84+
<Run FontWeight="SemiBold">Can't find what you're looking for?</Run>
85+
<LineBreak/>
86+
<Run>You have existing forks of this repository:</Run>
87+
</TextBlock>
88+
<!--
89+
ItemsSource="{Binding ExistingForks}"
90+
-->
91+
<ItemsControl DockPanel.Dock="Bottom" MaxHeight="120" Padding="8 0" ScrollViewer.VerticalScrollBarVisibility="Auto">
92+
<StackPanel Orientation="Horizontal" Margin="0 4 0 0">
8793
<ui:OcticonImage Icon="repo_forked" Margin="0,0,2,-2"/>
88-
<TextBlock Text="{Binding Owner, Mode=OneWay}"/>
89-
<TextBlock Text="/"/>
90-
<TextBlock Text="{Binding Name, Mode=OneWay}"/>
94+
<TextBlock Text="donokuda/foo-bar" />
9195
</StackPanel>
92-
</DataTemplate>
93-
</ListBox.ItemTemplate>
94-
</ListBox>
96+
97+
<StackPanel Orientation="Horizontal" Margin="0 4 0 0">
98+
<ui:OcticonImage Icon="repo_forked" Margin="0,0,2,-2"/>
99+
<TextBlock Text="donokuda/foo-bar" />
100+
</StackPanel>
101+
102+
<StackPanel Orientation="Horizontal" Margin="0 4 0 0">
103+
<ui:OcticonImage Icon="repo_forked" Margin="0,0,2,-2"/>
104+
<TextBlock Text="donokuda/foo-bar" />
105+
</StackPanel>
106+
<!--
107+
<ItemsControl.ItemTemplate>
108+
<DataTemplate>
109+
<StackPanel Orientation="Horizontal">
110+
<ui:OcticonImage Icon="repo_forked" Margin="0,0,2,-2"/>
111+
<TextBlock Text="{Binding Owner, Mode=OneWay}"/>
112+
<TextBlock Text="/"/>
113+
<TextBlock Text="{Binding Name, Mode=OneWay}"/>
114+
</StackPanel>
115+
</DataTemplate>
116+
</ListBox.ItemTemplate>
117+
-->
118+
</ItemsControl>
119+
</DockPanel>
95120
</DockPanel>
96121
</Grid>
97122
</UserControl>

0 commit comments

Comments
 (0)