summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Konstantin2013-01-07 17:02:57 +0400
committerGravatar Konstantin2013-01-07 17:02:57 +0400
commit8f4b92424cb6422dd7b10c43775e9dce54dad3f2 (patch)
treeedf2a1ea00390d80556779edd1de585d844e5257
parent8316abc300d56f876a5fe3b511dc202556ad776c (diff)
parent6b84ed69bdceea6873897898144792fa4fa12cf4 (diff)
Merge branch 'style'
Diffstat
-rw-r--r--CommonResources/Application.svg20
-rw-r--r--CommonResources/SplashScreenImage.svg29
-rw-r--r--Juick/ApplicationIcon.pngbin749 -> 3274 bytes
-rw-r--r--Juick/ApplicationTile.pngbin5278 -> 4187 bytes
-rw-r--r--Juick/LoginView.xaml2
-rw-r--r--Juick/MainPage.xaml32
-rw-r--r--Juick/NewPostView.xaml2
-rw-r--r--Juick/SplashScreenImage.jpgbin9417 -> 17118 bytes
8 files changed, 75 insertions, 10 deletions
diff --git a/CommonResources/Application.svg b/CommonResources/Application.svg
new file mode 100644
index 0000000..36a47cc
--- /dev/null
+++ b/CommonResources/Application.svg
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="45.323mm" height="45.323mm" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 4532 4532"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <style type="text/css">
+ <![CDATA[
+ .fil0 {fill:#FEFEFE}
+ ]]>
+ </style>
+ </defs>
+ <g id="Layer_x0020_1">
+ <metadata id="CorelCorpID_0Corel-Layer"/>
+ <g id="_271701456">
+ <path class="fil0" d="M2376 1626l607 4c-403,1897 -41,1719 -1520,1714l0 -294c19,0 54,0 67,0 0,26 0,52 0,70 690,2 528,117 845,-1494z"/>
+ <polygon class="fil0" points="2407,1481 2466,1182 3070,1181 3011,1481 "/>
+ </g>
+ </g>
+</svg>
diff --git a/CommonResources/SplashScreenImage.svg b/CommonResources/SplashScreenImage.svg
new file mode 100644
index 0000000..5cd1632
--- /dev/null
+++ b/CommonResources/SplashScreenImage.svg
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="210mm" height="297mm" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"
+viewBox="0 0 21000 29700"
+ xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <style type="text/css">
+ <![CDATA[
+ .fil0 {fill:#4488AA}
+ ]]>
+ </style>
+ </defs>
+ <g id="Layer_x0020_1">
+ <metadata id="CorelCorpID_0Corel-Layer"/>
+ <g id="_301171840">
+ <g>
+ <path class="fil0" d="M3568 2485l860 6c-572,2690 -58,2438 -2155,2430l1 -416c27,0 77,0 96,0 0,37 0,74 0,99 979,3 748,167 1198,-2119z"/>
+ <polygon class="fil0" points="3613,2279 3696,1855 4553,1855 4470,2279 "/>
+ </g>
+ <path class="fil0" d="M7570 2485l854 6c-183,863 -255,1423 -337,1786l-843 0c54,-295 149,-818 326,-1792z"/>
+ <path class="fil0" d="M6325 2488l841 1c-159,868 -258,1422 -327,1788l-840 0c54,-295 150,-815 326,-1789z"/>
+ <polygon class="fil0" points="7609,2280 7691,1855 8548,1855 8465,2280 "/>
+ <path class="fil0" d="M4549 3945l268 -1463 846 0c-80,420 -160,770 -216,1187 -10,78 -75,289 59,292 115,3 343,1 407,0 130,-2 154,-67 176,-177 19,174 54,174 -15,287 -47,76 -115,206 -260,205 -368,-1 -619,-15 -990,2 -177,8 -307,-152 -274,-334z"/>
+ <path class="fil0" d="M11079 1838l854 6c-183,863 -354,2067 -436,2430l-843 0c54,-295 248,-1462 425,-2436z"/>
+ <polygon class="fil0" points="11705,3079 12503,2462 13250,2462 13250,2557 13078,2557 12628,2956 13139,4183 13224,4185 13224,4280 12177,4280 11724,3197 11606,3199 "/>
+ <path class="fil0" d="M9171 2487l1488 -17 9 420 -102 0 0 -99c-283,0 -656,-10 -867,0 -67,-2 -125,3 -145,92 -58,251 -142,748 -160,962 -6,65 41,109 106,109l917 8 23 -111 95 -1 -81 427c-505,-1 -1010,-1 -1507,-6 -261,6 -435,-152 -400,-349 73,-413 139,-717 194,-1056 32,-196 203,-378 431,-380z"/>
+ </g>
+ </g>
+</svg>
diff --git a/Juick/ApplicationIcon.png b/Juick/ApplicationIcon.png
index c87126b..6fc266c 100644
--- a/Juick/ApplicationIcon.png
+++ b/Juick/ApplicationIcon.png
Binary files differ
diff --git a/Juick/ApplicationTile.png b/Juick/ApplicationTile.png
index 31cd1d3..96d0872 100644
--- a/Juick/ApplicationTile.png
+++ b/Juick/ApplicationTile.png
Binary files differ
diff --git a/Juick/LoginView.xaml b/Juick/LoginView.xaml
index db5e193..e7b61e8 100644
--- a/Juick/LoginView.xaml
+++ b/Juick/LoginView.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="signup" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
</StackPanel>
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>
diff --git a/Juick/SplashScreenImage.jpg b/Juick/SplashScreenImage.jpg
index 353b192..5feee2e 100644
--- a/Juick/SplashScreenImage.jpg
+++ b/Juick/SplashScreenImage.jpg
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-04 12:48:41 +0000