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

Commit 11c21f6

Browse files
donokudadonokuda
committed
Use only one box and do a little bit of clean up
1 parent 072c002 commit 11c21f6

File tree

1 file changed

+45
-54
lines changed

1 file changed

+45
-54
lines changed

‎src/GitHub.VisualStudio/Views/Dialog/ForkRepositoryExecuteView.xaml‎

Lines changed: 45 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<sampleData:ForkRepositoryExecuteViewModelDesigner/>
2525
</d:DesignProperties.DataContext>
2626

27-
<StackPanel>
27+
<StackPanel Margin="0 8 0 0">
2828
<TextBlock FontSize="16" TextWrapping="Wrap">
2929
You're about to fork the
3030
<Hyperlink>
@@ -39,65 +39,56 @@
3939
<TextBlock Margin="0 16 0 0" FontSize="14">This operation will:</TextBlock>
4040

4141
<StackPanel Orientation="Vertical">
42-
<Border Margin="0 8 0 0" CornerRadius="2" Background="#ffeff1f5" Padding="8">
43-
<Grid>
44-
<Grid.ColumnDefinitions>
45-
<ColumnDefinition Width="Auto" />
46-
<ColumnDefinition Width="*" />
47-
</Grid.ColumnDefinitions>
42+
<Border Margin="0 8 0 0" CornerRadius="2" Background="#ffeff1f5" Padding="16">
43+
<StackPanel>
44+
<Grid Margin="0 0 0 0">
45+
<Grid.ColumnDefinitions>
46+
<ColumnDefinition Width="Auto" />
47+
<ColumnDefinition Width="*" />
48+
</Grid.ColumnDefinitions>
4849

49-
<ui:OcticonImage Grid.Column="0" Icon="repo_forked" Background="Red" Height="16" Width="16" />
50-
<TextBlock Margin="8 0 0 0" Grid.Column="1" TextWrapping="Wrap">Fork the repository</TextBlock>
51-
</Grid>
52-
</Border>
53-
54-
<Border Margin="0 8 0 0" CornerRadius="2" Background="#ffeff1f5" Padding="8">
55-
<Grid>
56-
<Grid.ColumnDefinitions>
57-
<ColumnDefinition Width="Auto" />
58-
<ColumnDefinition Width="*" />
59-
</Grid.ColumnDefinitions>
60-
<ui:OcticonImage Grid.Column="0" Icon="home" Height="16" Width="16" />
50+
<ui:OcticonImage Grid.Column="0" Icon="repo_forked" Background="Red" Height="16" Width="16" />
51+
<TextBlock Margin="8 0 0 0" Grid.Column="1" TextWrapping="Wrap">Fork the repository</TextBlock>
52+
</Grid>
6153

62-
<TextBlock Margin="8 0 0 0" Grid.Column="1" TextWrapping="Wrap">
63-
Update your local repository's <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">origin</Run> to point to
64-
<Hyperlink><Run Text="{Binding DestinationRepository.CloneUrl, Mode=OneWay}"/></Hyperlink>
65-
</TextBlock>
66-
</Grid>
67-
</Border>
68-
69-
<Border Margin="0 8 0 0" CornerRadius="2" Background="#ffeff1f5" Padding="8">
70-
<Grid>
71-
<Grid.ColumnDefinitions>
72-
<ColumnDefinition Width="Auto" />
73-
<ColumnDefinition Width="*" />
74-
</Grid.ColumnDefinitions>
54+
<Grid Margin="0 16 0 0">
55+
<Grid.ColumnDefinitions>
56+
<ColumnDefinition Width="Auto" />
57+
<ColumnDefinition Width="*" />
58+
</Grid.ColumnDefinitions>
59+
<ui:OcticonImage Grid.Column="0" Icon="home" Height="16" Width="16" />
7560

76-
<ui:OcticonImage Grid.Column="0" Icon="globe" Height="16" Width="16" />
7761
<TextBlock Margin="8 0 0 0" Grid.Column="1" TextWrapping="Wrap">
78-
Add an <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">upstream</Run> remote pointing to
79-
<Hyperlink><Run Text="{Binding SourceRepository.CloneUrl, Mode=OneWay}"/></Hyperlink>
80-
</TextBlock>
81-
</Grid>
62+
Update your local repository's <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">origin</Run> to point to
63+
<Hyperlink><Run Text="{Binding DestinationRepository.CloneUrl, Mode=OneWay}"/></Hyperlink>
64+
</TextBlock>
65+
</Grid>
66+
67+
<Grid Margin="0 16 0 0" >
68+
<Grid.ColumnDefinitions>
69+
<ColumnDefinition Width="Auto" />
70+
<ColumnDefinition Width="*" />
71+
</Grid.ColumnDefinitions>
72+
73+
<ui:OcticonImage Grid.Column="0" Icon="globe" Height="16" Width="16" />
74+
<TextBlock Margin="8 0 0 0" Grid.Column="1" TextWrapping="Wrap">
75+
Add an <Run Style="{DynamicResource {x:Static markdig:Styles.CodeStyleKey}}">upstream</Run> remote pointing to
76+
<Hyperlink><Run Text="{Binding SourceRepository.CloneUrl, Mode=OneWay}"/></Hyperlink>
77+
</TextBlock>
78+
</Grid>
79+
</StackPanel>
8280
</Border>
8381

84-
<StackPanel Orientation="Vertical" Margin="0 8 0 0">
85-
<!--
86-
Text="{Binding Error, Mode=OneWay}"
87-
Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}"
88-
-->
89-
<TextBlock TextWrapping="Wrap"
90-
Foreground="Red"
91-
Margin="0 8"
92-
Text="Hello, yes this is fake error message for testing layout and seeing how this wraps."
93-
HorizontalAlignment="Left" />
94-
<Grid>
95-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
96-
<Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Margin="0 0 4 0" Click="backButton_OnClick">Back</Button>
97-
<Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Click="repoForkButton_OnClick">Fork Repository</Button>
98-
</StackPanel>
99-
</Grid>
100-
</StackPanel>
82+
<TextBlock TextWrapping="Wrap"
83+
Foreground="Red"
84+
Margin="0 8"
85+
Text="{Binding Error, Mode=OneWay}"
86+
Visibility="{Binding Error, Converter={ui:NullToVisibilityConverter}}"
87+
HorizontalAlignment="Left" />
88+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
89+
<Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Margin="0 0 4 0" Click="backButton_OnClick">Back</Button>
90+
<Button HorizontalAlignment="Right" Padding="16 4" BorderThickness="0" Click="repoForkButton_OnClick">Fork Repository</Button>
91+
</StackPanel>
10192
</StackPanel>
10293
</StackPanel>
10394
</UserControl>

0 commit comments

Comments
 (0)