diff options
| author |  Vitaly Takmazov | 2012-11-01 15:53:02 +0400 |
|---|---|---|
| committer | Vitaly Takmazov | 2012-11-01 15:53:02 +0400 |
| commit | 56b910c625fadcc712ba735a82a107e2bb0c9c41 (patch) | |
| tree | 08adcf5f2138eda14bc7a950a59429d8adb874e8 | |
| parent | 8316abc300d56f876a5fe3b511dc202556ad776c (diff) | |
| parent | 1d1cc1f47aba3835cb94a71658c9678929a1ca7d (diff) | |
Merge branch 'style' of https://bitbucket.org/vitalyster/juick-windowsphone
| -rw-r--r-- | Juick/ApplicationIcon.png | bin | 749 -> 3274 bytes | |||
| -rw-r--r-- | Juick/ApplicationTile.png | bin | 5278 -> 4187 bytes | |||
| -rw-r--r-- | Juick/MainPage.xaml | 32 | ||||
| -rw-r--r-- | Juick/NewPostView.xaml | 2 |
4 files changed, 25 insertions, 9 deletions
diff --git a/Juick/ApplicationIcon.png b/Juick/ApplicationIcon.png Binary files differindex c87126b..6fc266c 100644 --- a/Juick/ApplicationIcon.png +++ b/Juick/ApplicationIcon.png diff --git a/Juick/ApplicationTile.png b/Juick/ApplicationTile.png Binary files differindex 31cd1d3..96d0872 100644 --- a/Juick/ApplicationTile.png +++ b/Juick/ApplicationTile.png diff --git a/Juick/MainPage.xaml b/Juick/MainPage.xaml index bb7736b..a713a39 100644 --- a/Juick/MainPage.xaml +++ b/Juick/MainPage.xaml @@ -25,11 +25,22 @@ <Grid x:Name="LayoutRoot" Background="Transparent">
<!--Panorama control-->
- <controls:Panorama Title="Juick" FontSize="20">
-
+ <!--<controls:Panorama Title="Juick20">-->
+ <!--<controls:Panorama.TitleTemplate>
+ <DataTemplate>
+ <Grid Margin="0,80,0,0">
+ <ContentPresenter>
+ <TextBlock Foreground="Black" FontSize="20" Text="{Binding}"/>
+ </ContentPresenter>
+ </Grid>
+ </DataTemplate>
+ </controls:Panorama.TitleTemplate>-->
+ <controls:Pivot Title="juick">
<!--Use 'Orientation="Horizontal"' to enable a panel that lays out horizontally-->
- <controls:PanoramaItem x:Name="MainPanoramaItem" Header="My feed" Margin="0, -40, 0, 0">
+ <!--<controls:PanoramaItem x:Name="MainPanoramaItem" Header="My feed" Margin="0, -40, 0, 0">-->
+ <controls:PivotItem Header="My feed" Margin="0, -5, 0, 0">
+
<!--Double line list with image placeholder and text wrapping-->
<ListBox x:Name="Home"
Margin="0, 0, -12, 0"
@@ -44,7 +55,7 @@ <ListBox.ItemTemplate>
<DataTemplate>
<Border BorderBrush="{StaticResource PhoneForegroundBrush}" BorderThickness="0 0 0 1">
- <Grid >
+ <Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
@@ -82,8 +93,11 @@ </DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
- </controls:PanoramaItem>
- <controls:PanoramaItem x:Name="LastPanoramaItem" Header="Last" Margin="0, -40, 0, 0">
+ <!--</controls:PanoramaItem>-->
+ </controls:PivotItem>
+
+ <!--<controls:PanoramaItem x:Name="LastPanoramaItem" Header="Last" Margin="0, -40, 0, 0">-->
+ <controls:PivotItem Header="Last" Margin="0, -5, 0, 0">
<!--Double line list with image placeholder and text wrapping-->
<ListBox x:Name="Last" Margin="0,0,-12,0"
ItemsSource="{Binding Items}"
@@ -134,8 +148,10 @@ </DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
- </controls:PanoramaItem>
- </controls:Panorama>
+ <!--</controls:PanoramaItem>-->
+ </controls:PivotItem>
+ <!--</controls:Panorama>-->
+ </controls:Pivot>
</Grid>
<phone:PhoneApplicationPage.ApplicationBar>
<shell:ApplicationBar IsVisible="True" IsMenuEnabled="True">
diff --git a/Juick/NewPostView.xaml b/Juick/NewPostView.xaml index 1065488..f3a911b 100644 --- a/Juick/NewPostView.xaml +++ b/Juick/NewPostView.xaml @@ -22,7 +22,7 @@ <!--TitlePanel contains the name of the application and page title-->
<StackPanel x:Name="TitlePanel" Grid.Row="0" Margin="12,17,0,28">
- <TextBlock x:Name="ApplicationTitle" Text="JUICK" Style="{StaticResource PhoneTextNormalStyle}"/>
+ <TextBlock x:Name="ApplicationTitle" Text="juick" Style="{StaticResource PhoneTextNormalStyle}"/>
<TextBlock x:Name="PageTitle" Text="new message" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>
|
