5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-31 15:36:07 +00:00
Code Issues Projects Releases Wiki Activity

Suppression styles problématiques avec XF vNext

Browse source
This commit is contained in:
Yan Maniez 2019-09-11 15:14:46 +02:00
parent e6444a9837
commit 3353d7aa51
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
AideDeJeu/AideDeJeu/App.xaml
View file

@ -101,61 +101,61 @@
<!-- MarkdownView --> <!-- MarkdownView -->
<Style TargetType="Label" x:Key="paragraph"> <Style TargetType="Label" x:Key="paragraph" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="15" /> <Setter Property="FontSize" Value="15" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
<Setter Property="FontFamily" Value="serif" /> <Setter Property="FontFamily" Value="serif" />
</Style> </Style>
<Style TargetType="Label" x:Key="heading1"> <Style TargetType="Label" x:Key="heading1" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="30" /> <Setter Property="FontSize" Value="30" />
<Setter Property="TextColor" Value="{StaticResource HDRed}" /> <Setter Property="TextColor" Value="{StaticResource HDRed}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitalsBold}" /> <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitalsBold}" />
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="heading2"> <Style TargetType="Label" x:Key="heading2" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="25" /> <Setter Property="FontSize" Value="25" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" /> <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="heading3"> <Style TargetType="Label" x:Key="heading3" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="20" /> <Setter Property="FontSize" Value="20" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" /> <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="heading4"> <Style TargetType="Label" x:Key="heading4" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="18" /> <Setter Property="FontSize" Value="18" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" /> <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="heading5"> <Style TargetType="Label" x:Key="heading5" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="16" /> <Setter Property="FontSize" Value="16" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" /> <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="heading6"> <Style TargetType="Label" x:Key="heading6" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="15" /> <Setter Property="FontSize" Value="15" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
<Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" /> <Setter Property="FontFamily" Value="{DynamicResource LinuxLibertineCapitals}" />
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="link"> <Style TargetType="Label" x:Key="link" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="15" /> <Setter Property="FontSize" Value="15" />
<Setter Property="TextColor" Value="{StaticResource HDBlue}" /> <Setter Property="TextColor" Value="{StaticResource HDBlue}" />
<Setter Property="FontFamily" Value="serif" /> <Setter Property="FontFamily" Value="serif" />
</Style> </Style>
<Style TargetType="Label" x:Key="tableheader"> <Style TargetType="Label" x:Key="tableheader" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="12" />
<Setter Property="Margin" Value="1" /> <Setter Property="Margin" Value="1" />
<Setter Property="TextColor" Value="{StaticResource HDWhite}" /> <Setter Property="TextColor" Value="{StaticResource HDWhite}" />
@ -164,7 +164,7 @@
<Setter Property="FontAttributes" Value="Bold" /> <Setter Property="FontAttributes" Value="Bold" />
</Style> </Style>
<Style TargetType="Label" x:Key="tablecell"> <Style TargetType="Label" x:Key="tablecell" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="12" />
<Setter Property="Margin" Value="1" /> <Setter Property="Margin" Value="1" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />
@ -172,7 +172,7 @@
<Setter Property="FontFamily" Value="serif" /> <Setter Property="FontFamily" Value="serif" />
</Style> </Style>
<Style TargetType="Label" x:Key="tablecellalt"> <Style TargetType="Label" x:Key="tablecellalt" ApplyToDerivedTypes="True">
<Setter Property="FontSize" Value="12" /> <Setter Property="FontSize" Value="12" />
<Setter Property="Margin" Value="1" /> <Setter Property="Margin" Value="1" />
<Setter Property="TextColor" Value="{StaticResource HDBlack}" /> <Setter Property="TextColor" Value="{StaticResource HDBlack}" />

5
AideDeJeu/AideDeJeu/Views/Library/BookmarksPage.xaml
View file

@ -28,8 +28,9 @@
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Picker x:Name="BookmarkCollectionPicker" Grid.Column="0" Grid.Row="0" Style="{StaticResource heading1}" HorizontalOptions="Fill" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}"> <Picker x:Name="BookmarkCollectionPicker" Grid.Column="0" Grid.Row="0" HorizontalOptions="Fill" ItemsSource="{Binding BookmarkCollectionNames, Mode=OneWay}" ItemDisplayBinding="{Binding Mode=OneWay}" SelectedIndex="{Binding BookmarkCollectionIndex, Mode=TwoWay}">
<Picker.Behaviors> <!--Style="{StaticResource heading1}"-->
<Picker.Behaviors>
<tools:EventToCommandBehavior EventName="SelectedIndexChanged" Command="{Binding BindingContext.SelectedIndexChangedCommand, Source={x:Reference This}}" /> <tools:EventToCommandBehavior EventName="SelectedIndexChanged" Command="{Binding BindingContext.SelectedIndexChangedCommand, Source={x:Reference This}}" />
</Picker.Behaviors> </Picker.Behaviors>
</Picker> </Picker>

5
AideDeJeu/AideDeJeu/Views/Library/DeepSearchPage.xaml
View file

@ -21,8 +21,9 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<SearchBar Style="{StaticResource heading3}" Grid.Column="0" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}"> <SearchBar Grid.Column="0" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
<!--<SearchBar.Behaviors> <!--Style="{StaticResource heading3}"-->
<!--<SearchBar.Behaviors>
<tools:TextChangedBehavior /> <tools:TextChangedBehavior />
</SearchBar.Behaviors>--> </SearchBar.Behaviors>-->
</SearchBar> </SearchBar>