diff --git a/AideDeJeu/AideDeJeu/App.xaml b/AideDeJeu/AideDeJeu/App.xaml index 48ab2260..15f9ffbe 100644 --- a/AideDeJeu/AideDeJeu/App.xaml +++ b/AideDeJeu/AideDeJeu/App.xaml @@ -4,6 +4,18 @@ x:Class="AideDeJeu.App"> + + #9B1C47 + #563F5A + #6F5B73 + #7C7B7B + #3A213C + #B5AAB9 + #EDEDED + #FFFFFF + #000000 + + #2196F3 #1976D2 #96d1ff @@ -48,7 +60,7 @@ #E0E5C1 - #F7F2E5 + #FFFFFF #E69A28 #FDF1DC @@ -68,13 +80,13 @@ #F0DBB5 @@ -221,9 +233,10 @@ + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/App.xaml.cs b/AideDeJeu/AideDeJeu/App.xaml.cs index 740ba218..df7ed07d 100644 --- a/AideDeJeu/AideDeJeu/App.xaml.cs +++ b/AideDeJeu/AideDeJeu/App.xaml.cs @@ -21,7 +21,7 @@ namespace AideDeJeu var tabbeddPage = new AideDeJeu.Views.MainTabbedPage(); //var mainPage = new ItemDetailPage(new ItemDetailViewModel(new HomeItem()) { Title = "Haches & Dés" }); var titlered = (Color)Resources["titlered"]; - var bgtan = (Color)Resources["bgtan"]; + var bgtan = (Color)Resources["HDWhite"]; //var navigationPage = new MainNavigationPage(mainPage) { BarBackgroundColor = titlered, BarTextColor = bgtan }; //tabbeddPage.MainNavigationPage = navigationPage; var navigationPage = tabbeddPage.MainNavigationPage; diff --git a/AideDeJeu/AideDeJeu/Markdig/MarkdownThemes.cs b/AideDeJeu/AideDeJeu/Markdig/MarkdownThemes.cs index 0cc49f05..0a422d88 100644 --- a/AideDeJeu/AideDeJeu/Markdig/MarkdownThemes.cs +++ b/AideDeJeu/AideDeJeu/Markdig/MarkdownThemes.cs @@ -43,7 +43,7 @@ namespace AideDeJeu.Tools this.Separator.BorderColor = DefaultSeparatorColor; } - public static readonly Color DefaultBackgroundColor = Color.FromHex("#F7F2E5"); + public static readonly Color DefaultBackgroundColor = Color.FromHex("#FFFFFF"); public static readonly Color DefaultAccentColor = Color.FromHex("#0366d6"); diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml index 603f2a29..93d56de4 100644 --- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml @@ -25,8 +25,8 @@ - diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml index 01ea7eba..a1662306 100644 --- a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml @@ -11,7 +11,7 @@ - + diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml index a8ef2621..cbb4f958 100644 --- a/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/BookmarksPage.xaml @@ -11,7 +11,7 @@ - + diff --git a/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml b/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml index 40a5313f..d5deeb1e 100644 --- a/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/DeepSearchPage.xaml @@ -6,7 +6,7 @@ xmlns:tools="clr-namespace:AideDeJeu.Tools" xmlns:properties="clr-namespace:AideDeJeu.Properties" x:Name="This" - BackgroundColor="{StaticResource bgtan}" + BackgroundColor="{StaticResource HDWhite}" Title="Recherche" Icon="crystal_ball.png"> diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml index 1dda05f9..0e5a7e94 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml @@ -21,7 +21,7 @@ --> - + + BackgroundColor="{StaticResource HDWhite}" + BarBackgroundColor="{StaticResource HDWhite}" + BarTextColor="{StaticResource HDRed}"> + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml index f0605a8c..191c2938 100644 --- a/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MainTabbedPage.xaml @@ -5,9 +5,9 @@ xmlns:views="clr-namespace:AideDeJeu.Views" x:Class="AideDeJeu.Views.MainTabbedPage" Padding="0" - BackgroundColor="{StaticResource bgtan}" - BarBackgroundColor="{StaticResource rulered}" - BarTextColor="{StaticResource bgtan}" + BackgroundColor="{StaticResource HDWhite}" + BarBackgroundColor="{StaticResource HDWhite}" + BarTextColor="{StaticResource HDGrey}" xmlns:windows="clr-namespace:Xamarin.Forms.PlatformConfiguration.WindowsSpecific;assembly=Xamarin.Forms.Core" windows:TabbedPage.HeaderIconsEnabled="true" xmlns:android="clr-namespace:Xamarin.Forms.PlatformConfiguration.AndroidSpecific;assembly=Xamarin.Forms.Core"