Skip to content

Commit 5e27ec6

Browse files
authored
Merge pull request #766 from unoplatform/dev/agzi/FixColors
fix(ToDo): Multiple colors and UI related issues
2 parents 3eabc60 + 63f1f37 commit 5e27ec6

29 files changed

+1089
-1576
lines changed

reference/ToDo/src/ToDo/App.xaml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Application x:Class="ToDo.App"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:wasm="http://platform.uno/wasm"
5-
xmlns:utum="using:Uno.Toolkit.UI.Material"
6-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:converters="using:ToDo.Converters"
8-
mc:Ignorable="wasm">
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:wasm="http://platform.uno/wasm"
5+
xmlns:utum="using:Uno.Toolkit.UI.Material"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
xmlns:converters="using:ToDo.Converters"
8+
mc:Ignorable="wasm">
99

1010
<Application.Resources>
1111
<ResourceDictionary>
@@ -15,8 +15,8 @@
1515

1616
<!-- Load Material Toolkit resources -->
1717
<MaterialToolkitTheme xmlns="using:Uno.Toolkit.UI.Material"
18-
ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml"
19-
FontOverrideSource="ms-appx:///Styles/MaterialFontsOverride.xaml" />
18+
ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml"
19+
FontOverrideSource="ms-appx:///Styles/MaterialFontsOverride.xaml" />
2020

2121
<ResourceDictionary>
2222
<ResourceDictionary.ThemeDictionaries>
@@ -31,19 +31,15 @@
3131

3232
<!-- Application's custom styles -->
3333
<ResourceDictionary Source="ms-appx:///Styles/FeedView.xaml" />
34-
<ResourceDictionary Source="ms-appx:///Styles/NavigationBar.xaml" />
3534
<ResourceDictionary Source="ms-appx:///Styles/NavigationView.xaml" />
3635

3736
</ResourceDictionary.MergedDictionaries>
3837

39-
<x:Double x:Key="LandscapeMaxPageWidth">500</x:Double>
40-
4138
<!-- To override the default FlyoutLightDismissOverlayBackground resource -->
4239
<SolidColorBrush x:Key="FlyoutLightDismissOverlayBackground"
43-
Color="{ThemeResource OverlayColor}" />
40+
Color="{ThemeResource OverlayColor}" />
4441

4542
<x:Double x:Key="WideMinWindowWidth">800</x:Double>
46-
<x:Double x:Key="ExtraWideMinWindowWidth">1000</x:Double>
4743

4844
<converters:FormatConverter x:Key="FormatConverter" />
4945
<converters:StringFormatter x:Key="StringFormatter" />
Lines changed: 3 additions & 136 deletions
Loading
Lines changed: 3 additions & 136 deletions
Loading

0 commit comments

Comments
 (0)