diff options
author | Stephane Delcroix <stephane@delcroix.org> | 2016-12-01 22:54:14 +0100 |
---|---|---|
committer | Stephane Delcroix <stephane@delcroix.org> | 2016-12-01 22:54:14 +0100 |
commit | 84f42e5b14156eac3773d914df2e1514fb76f51b (patch) | |
tree | 13561dc4a0de125359927a19d0e244515442d5c8 /Xamarin.Forms.Platform.UAP | |
parent | 3ff3487d4fa5edb7ba3dcd7b6db0e6b58b03809c (diff) | |
download | xamarin-forms-84f42e5b14156eac3773d914df2e1514fb76f51b.tar.gz xamarin-forms-84f42e5b14156eac3773d914df2e1514fb76f51b.tar.bz2 xamarin-forms-84f42e5b14156eac3773d914df2e1514fb76f51b.zip |
Revert "Jimmgarrido uwp toolbar (#588)"
This reverts commit 1ff0db9c6f4ba1167e6b2620066f83088f23c5bf.
Diffstat (limited to 'Xamarin.Forms.Platform.UAP')
-rw-r--r-- | Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml | 5 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.UAP/PageControlStyle.xaml | 5 | ||||
-rw-r--r-- | Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml | 6 |
3 files changed, 6 insertions, 10 deletions
diff --git a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml index cd3a4401..d82f78af 100644 --- a/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/MasterDetailControlStyle.xaml @@ -3,8 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style TargetType="uwp:MasterDetailControl"> - <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> - <Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> + <Setter Property="ToolbarForeground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="uwp:MasterDetailControl"> @@ -48,7 +47,7 @@ </StackPanel> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" /> + <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> </Border> </Grid> diff --git a/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml b/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml index e1137a7c..bd199487 100644 --- a/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/PageControlStyle.xaml @@ -4,8 +4,7 @@ xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style TargetType="uwp:PageControl"> <Setter Property="ContentMargin" Value="0" /> - <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> - <Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> + <Setter Property="TitleBrush" Value="{ThemeResource DefaultTextForegroundThemeBrush}" /> <Setter Property="Template"> <Setter.Value> <ControlTemplate TargetType="uwp:PageControl"> @@ -28,7 +27,7 @@ </Border> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" /> + <uwp:FormsCommandBar x:Name="CommandBar" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> </Border> </Grid> diff --git a/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml b/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml index de6bcf1e..6d54a073 100644 --- a/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml +++ b/Xamarin.Forms.Platform.UAP/TabbedPageStyle.xaml @@ -3,9 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:uwp="using:Xamarin.Forms.Platform.UWP"> <Style x:Key="TabbedPageStyle" TargetType="uwp:FormsPivot"> - <Setter Property="ToolbarBackground" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}"/> - - <Setter Property="HeaderTemplate"> + <Setter Property="HeaderTemplate"> <Setter.Value> <DataTemplate> <TextBlock Name="TabbedPageHeaderTextBlock" Text="{Binding Title}" Style="{ThemeResource BodyTextBlockStyle}" /> @@ -77,7 +75,7 @@ </Border> <Border x:Name="TopCommandBarArea" Grid.Column="1" HorizontalAlignment="Stretch"> - <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" /> + <uwp:FormsCommandBar x:Name="CommandBar" VerticalContentAlignment="Top" Background="{TemplateBinding ToolbarBackground}" Height="{ThemeResource TitleBarHeight}" /> </Border> </Grid> |