Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved all left and right margins. Fixed List view if necessary #51

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gi7/Controls/EventsPanel.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<local:EventListBox Request="{Binding EventsRequest}" x:Name="EventsList">
<local:EventListBox.ItemTemplate>
<DataTemplate>
<Grid Margin="0,0,0,20">
<Grid Margin="12,0,12,20">
<Image Source="{Binding Path=Actor.AvatarUrl, Converter={StaticResource GravatarSizeConverter}, ConverterParameter=70}" Width="70" Height="70" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" />
<Border Background="{StaticResource PhoneAccentBrush}" Height="20" Width="20" Padding="2" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="47,8,0,0">
<Image Source="{Binding Converter={StaticResource EventConverter}, ConverterParameter=image}" Width="16" Height="16" OpacityMask="{x:Null}" />
Expand Down
14 changes: 7 additions & 7 deletions Gi7/Controls/LoginPanel.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
Foreground="{StaticResource PhoneForegroundBrush}" d:DesignHeight="480" d:DesignWidth="480"
DataContext="{Binding Path=LoginPanelViewModel, Source={StaticResource ViewModelLocator}}">

<StackPanel Orientation="Vertical">
<TextBlock Text="Email" />
<TextBox Text="{Binding Email, Mode=TwoWay}" />
<TextBlock Text="Password" />
<PasswordBox Password="{Binding Password, Mode=TwoWay}" />
<Button Content="Login" Command="{Binding LoginCommand}" />
</StackPanel>
<StackPanel Orientation="Vertical" Margin="12,0,12,0">
<TextBlock Text="Email" />
<TextBox Text="{Binding Email, Mode=TwoWay}" />
<TextBlock Text="Password" />
<PasswordBox Password="{Binding Password, Mode=TwoWay}" />
<Button Content="Login" Command="{Binding LoginCommand}" />
</StackPanel>
</UserControl>
122 changes: 61 additions & 61 deletions Gi7/Controls/ProfilePanel.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,71 +6,71 @@
FontSize="{StaticResource PhoneFontSizeNormal}" Foreground="{StaticResource PhoneForegroundBrush}" d:DesignHeight="480"
d:DesignWidth="380">

<ScrollViewer>
<StackPanel Orientation="Vertical">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" MinWidth="150" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image Source="{Binding Path=User.AvatarUrl, Converter={StaticResource GravatarSizeConverter}, ConverterParameter=150}" Grid.RowSpan="4" />
<Grid Grid.Column="1">
<TextBlock Text="Login:" d:LayoutOverrides="Height" VerticalAlignment="Center" Margin="5,0,0,0" />
<TextBlock Text="{Binding User.Login}" FontSize="21.333" Grid.Column="1" TextAlignment="Right"
VerticalAlignment="Center" Margin="0,0,5,0" />
</Grid>
<Grid Grid.Row="1" Grid.Column="1">
<TextBlock Text="Name:" Grid.Column="1" d:LayoutOverrides="Height" Grid.Row="1"
VerticalAlignment="Center" Margin="5,0,0,0" />
<TextBlock Text="{Binding User.Name}" FontSize="21.333" Grid.Column="1" Grid.Row="1"
d:LayoutOverrides="Height" TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,5,0" />
</Grid>
<Grid Grid.Row="2" Grid.Column="1">
<TextBlock Text="Location:" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center"
Margin="5,0,0,0" />
<TextBlock Text="{Binding User.Location}" FontSize="21.333" Grid.Column="1" Grid.Row="1" TextAlignment="Right"
VerticalAlignment="Center" Margin="0,0,5,0" />
</Grid>
<Grid Grid.Row="3" Grid.Column="1">
<TextBlock Text="Web" Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Margin="5,0,0,0" />
<HyperlinkButton Content="Blog" NavigateUri="{Binding User.Blog}" TargetName="_blank"
<ScrollViewer>
<StackPanel Orientation="Vertical" Margin="12,0,12,0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" MinWidth="150" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Image Source="{Binding Path=User.AvatarUrl, Converter={StaticResource GravatarSizeConverter}, ConverterParameter=150}" Grid.RowSpan="4" />
<Grid Grid.Column="1">
<TextBlock Text="Login:" d:LayoutOverrides="Height" VerticalAlignment="Center" Margin="5,0,0,0" />
<TextBlock Text="{Binding User.Login}" FontSize="21.333" Grid.Column="1" TextAlignment="Right"
VerticalAlignment="Center" Margin="0,0,5,0" />
</Grid>
<Grid Grid.Row="1" Grid.Column="1">
<TextBlock Text="Name:" Grid.Column="1" d:LayoutOverrides="Height" Grid.Row="1"
VerticalAlignment="Center" Margin="5,0,0,0" />
<TextBlock Text="{Binding User.Name}" FontSize="21.333" Grid.Column="1" Grid.Row="1"
d:LayoutOverrides="Height" TextAlignment="Right" VerticalAlignment="Center" Margin="0,0,5,0" />
</Grid>
<Grid Grid.Row="2" Grid.Column="1">
<TextBlock Text="Location:" Grid.Column="1" Grid.Row="2" VerticalAlignment="Center"
Margin="5,0,0,0" />
<TextBlock Text="{Binding User.Location}" FontSize="21.333" Grid.Column="1" Grid.Row="1" TextAlignment="Right"
VerticalAlignment="Center" Margin="0,0,5,0" />
</Grid>
<Grid Grid.Row="3" Grid.Column="1">
<TextBlock Text="Web" Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" Margin="5,0,0,0" />
<HyperlinkButton Content="Blog" NavigateUri="{Binding User.Blog}" TargetName="_blank"
Grid.Column="1" Grid.Row="3" HorizontalAlignment="Right" FontSize="21.333" VerticalAlignment="Center" Margin="0,0,-7,0" />
</Grid>
</Grid>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
</Grid>
</Grid>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock Text="{Binding User.PublicRepos}" FontSize="24" Foreground="Gray" Grid.Column="0"
Grid.Row="0" TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Public repos" Grid.Column="0" Grid.Row="0" FontSize="24" />
<TextBlock Text="{Binding User.PublicRepos}" FontSize="24" Foreground="Gray" Grid.Column="0"
Grid.Row="0" TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Public repos" Grid.Column="0" Grid.Row="0" FontSize="24" />

<TextBlock Text="{Binding User.TotalPrivateRepos}" FontSize="24" Foreground="Gray" Grid.Column="1"
Grid.Row="0" TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Private repos" Grid.Column="1" Grid.Row="0" FontSize="24" />
<TextBlock Text="{Binding User.TotalPrivateRepos}" FontSize="24" Foreground="Gray" Grid.Column="1"
Grid.Row="0" TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Private repos" Grid.Column="1" Grid.Row="0" FontSize="24" />

<TextBlock Text="{Binding User.Followers}" FontSize="24" Foreground="Gray" Grid.Column="0" Grid.Row="1"
TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Followers" Grid.Column="0" Grid.Row="1" FontSize="24" />
<TextBlock Text="{Binding User.Followers}" FontSize="24" Foreground="Gray" Grid.Column="0" Grid.Row="1"
TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Followers" Grid.Column="0" Grid.Row="1" FontSize="24" />

<TextBlock Text="{Binding User.Following}" FontSize="24" Foreground="Gray" Grid.Column="1" Grid.Row="1"
TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Following" Grid.Column="1" Grid.Row="1" FontSize="24" />
</Grid>
<HyperlinkButton Content="See on github" NavigateUri="{Binding User.HtmlUrl}" TargetName="_blank"
<TextBlock Text="{Binding User.Following}" FontSize="24" Foreground="Gray" Grid.Column="1" Grid.Row="1"
TextAlignment="Right" Margin="0,0,5,0" />
<TextBlock Text="Following" Grid.Column="1" Grid.Row="1" FontSize="24" />
</Grid>
<HyperlinkButton Content="See on github" NavigateUri="{Binding User.HtmlUrl}" TargetName="_blank"
HorizontalAlignment="Right" />
</StackPanel>
</ScrollViewer>
</StackPanel>
</ScrollViewer>
</UserControl>
44 changes: 22 additions & 22 deletions Gi7/Controls/RepositoryPanel.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@
FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}"
Foreground="{StaticResource PhoneForegroundBrush}" d:DesignHeight="480" d:DesignWidth="480">

<ScrollViewer>
<StackPanel Orientation="Vertical">
<Border BorderThickness="0,0,0,2" BorderBrush="Gainsboro">
<ScrollViewer>
<StackPanel Orientation="Vertical" Margin="12,0,12,0">
<Border BorderThickness="0,0,0,2" BorderBrush="Gainsboro">
<TextBlock Text="Watched Repos" FontSize="48" Foreground="{StaticResource PhoneAccentBrush}" />
</Border>
<ListBox x:Name="WatchedRepos" ItemsSource="{Binding WatchedRepos}"
</Border>
<ListBox x:Name="WatchedRepos" ItemsSource="{Binding WatchedRepos}"
ScrollViewer.VerticalScrollBarVisibility="Disabled" FontSize="26.667" Margin="0,8">
<Interactivity:Interaction.Triggers>
<Interactivity:EventTrigger EventName="Tap">
<Command:EventToCommand Command="{Binding RepoSelectedCommand}"
<Interactivity:Interaction.Triggers>
<Interactivity:EventTrigger EventName="Tap">
<Command:EventToCommand Command="{Binding RepoSelectedCommand}"
CommandParameter="{Binding SelectedItem, ElementName=WatchedRepos}" />
</Interactivity:EventTrigger>
</Interactivity:Interaction.Triggers>
</ListBox>
<Border BorderThickness="0,0,0,2" BorderBrush="Gainsboro">
</Interactivity:EventTrigger>
</Interactivity:Interaction.Triggers>
</ListBox>
<Border BorderThickness="0,0,0,2" BorderBrush="Gainsboro">
<TextBlock Text="Owned Repos" FontSize="48" Foreground="{StaticResource PhoneAccentBrush}" Margin="0,20,0,0"/>
</Border>
<ListBox x:Name="OwnedRepos" ItemsSource="{Binding OwnedRepos}"
</Border>
<ListBox x:Name="OwnedRepos" ItemsSource="{Binding OwnedRepos}"
ScrollViewer.VerticalScrollBarVisibility="Disabled" FontSize="26.667" Margin="0,8">
<Interactivity:Interaction.Triggers>
<Interactivity:EventTrigger EventName="Tap">
<Command:EventToCommand Command="{Binding RepoSelectedCommand}"
<Interactivity:Interaction.Triggers>
<Interactivity:EventTrigger EventName="Tap">
<Command:EventToCommand Command="{Binding RepoSelectedCommand}"
CommandParameter="{Binding SelectedItem, ElementName=OwnedRepos}" />
</Interactivity:EventTrigger>
</Interactivity:Interaction.Triggers>
</ListBox>
</StackPanel>
</ScrollViewer>
</Interactivity:EventTrigger>
</Interactivity:Interaction.Triggers>
</ListBox>
</StackPanel>
</ScrollViewer>
</UserControl>
2 changes: 1 addition & 1 deletion Gi7/Controls/TreePanel.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
FontFamily="{StaticResource PhoneFontFamilyNormal}" FontSize="{StaticResource PhoneFontSizeNormal}"
Foreground="{StaticResource PhoneForegroundBrush}" d:DesignHeight="480" d:DesignWidth="480">

<ListBox x:Name="Objects" ItemsSource="{Binding Tree.Tree}">
<ListBox x:Name="Objects" ItemsSource="{Binding Tree.Tree}" Margin="12,0,12,0">
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
Expand Down
2 changes: 1 addition & 1 deletion Gi7/Controls/UserTemplate.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<toolkit:HubTile Title="{Binding Login}" Message="{Binding Login}" Source="{Binding AvatarUrl, Converter={StaticResource GravatarSizeConverter}, ConverterParameter=175}" Margin="3" FontSize="13.333" />
</DataTemplate>
<ItemsPanelTemplate x:Key="UserTemplateFormat">
<toolkit:WrapPanel Orientation="Horizontal" />
<toolkit:WrapPanel Orientation="Horizontal" Margin="12,0,12,0" />
</ItemsPanelTemplate>
</ResourceDictionary>
2 changes: 1 addition & 1 deletion Gi7/Views/AboutView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
DataContext="{Binding Path=AboutViewModel, Source={StaticResource ViewModelLocator}}">

<!--LayoutRoot is the root grid where all page content is placed-->
<Grid x:Name="LayoutRoot" Background="Transparent">
<Grid x:Name="LayoutRoot" Background="Transparent" Margin="12,0,12,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
Expand Down
4 changes: 2 additions & 2 deletions Gi7/Views/BlobView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
DataContext="{Binding Path=BlobViewModel, Source={StaticResource ViewModelLocator}}">

<!--LayoutRoot is the root grid where all page content is placed-->
<Grid x:Name="LayoutRoot" Background="Transparent">
<Grid x:Name="LayoutRoot" Background="Transparent" Margin="12,0,12,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
Expand All @@ -28,7 +28,7 @@

<!--ContentPanel - place additional content here-->
<StackPanel Grid.Row="1" Margin="12,0,12,0">
<ListBox Height="600" Width="450" ItemsSource="{Binding TextFile}" ScrollViewer.HorizontalScrollBarVisibility="Auto">
<ListBox Height="600" Width="432" ItemsSource="{Binding TextFile}" ScrollViewer.HorizontalScrollBarVisibility="Auto">
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Text="{Binding}" />
Expand Down
4 changes: 2 additions & 2 deletions Gi7/Views/CommitView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</Interactivity:Interaction.Triggers>
<controls:PivotItem Header="Commit">
<ScrollViewer Grid.Row="1">
<StackPanel>
<StackPanel Margin="12,0,12,0">
<Grid Margin="0,0,0,10">
<Image Source="{Binding Commit.Author.AvatarUrl, Converter={StaticResource GravatarSizeConverter}, ConverterParameter=70}" Width="70" Height="70"
HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" />
Expand Down Expand Up @@ -83,7 +83,7 @@
</ScrollViewer>
</controls:PivotItem>
<controls:PivotItem Header="Comments">
<Grid>
<Grid Margin="12,0,12,0">
<Grid.RowDefinitions>
<RowDefinition Height="460"/>
<RowDefinition Height="Auto"/>
Expand Down
2 changes: 1 addition & 1 deletion Gi7/Views/CreateIssueView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
DataContext="{Binding Path=CreateIssueViewModel, Source={StaticResource ViewModelLocator}}" d:DesignHeight="768" d:DesignWidth="480">

<!--LayoutRoot is the root grid where all page content is placed-->
<Grid x:Name="LayoutRoot" Background="Transparent">
<Grid x:Name="LayoutRoot" Background="Transparent" Margin="12,0,12,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
Expand Down
4 changes: 2 additions & 2 deletions Gi7/Views/HomeView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@
</controls:PanoramaItem>
<controls:PanoramaItem Header="Explore">
<ScrollViewer>
<StackPanel Orientation="Vertical">
<StackPanel Orientation="Vertical" Margin="12,0,12,0">
<TextBlock Text="Featured Repos" FontSize="30" />
<ListBox x:Name="FeaturedRepos" ItemsSource="{Binding FeaturedRepos}"
ScrollViewer.VerticalScrollBarVisibility="Disabled">
ScrollViewer.VerticalScrollBarVisibility="Disabled">
<ListBox.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Vertical">
Expand Down
4 changes: 2 additions & 2 deletions Gi7/Views/IssueView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</StackPanel>

<!--ContentPanel - place additional content here-->
<ScrollViewer Grid.Row="1" Margin="12,0,12,0" VerticalAlignment="Top">
<StackPanel>
<ScrollViewer Grid.Row="1" VerticalAlignment="Top">
<StackPanel Margin="12,0,12,0">
<TextBlock Text="{Binding Issue.Title}" FontWeight="Bold" TextWrapping="Wrap" FontSize="36" />
<Grid Margin="0,0,0,10">
<Image Source="{Binding Issue.User.AvatarUrl, Converter={StaticResource GravatarSizeConverter}, ConverterParameter=70}" Width="70" Height="70"
Expand Down
6 changes: 3 additions & 3 deletions Gi7/Views/PullRequestView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@

<controls:PivotItem Header="{Binding PullRequestName}">
<ScrollViewer Grid.Row="1">
<StackPanel>
<Grid Margin="0,0,0,10">
<StackPanel Margin="12,0,12,10">
<Grid>
<Image Source="{Binding PullRequest.User.AvatarUrl, Converter={StaticResource GravatarSizeConverter}, ConverterParameter=70}" Width="70" Height="70"
HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0,5,0,0" />
<TextBlock Text="{Binding PullRequest.User.Login}" HorizontalAlignment="Left"
Expand All @@ -65,7 +65,7 @@
</controls:PivotItem>

<controls:PivotItem Header="Comments">
<Grid>
<Grid Margin="12,0,12,0">
<Grid.RowDefinitions>
<RowDefinition Height="460"/>
<RowDefinition Height="Auto"/>
Expand Down
Loading