Skip to content

Commit d369b46

Browse files
committed
Merge remote-tracking branch 'refs/remotes/ButchersBoy/master' into ComboBoxClassicModeShowSelectedItem
2 parents 5d4db1a + 8259fcb commit d369b46

File tree

6 files changed

+14037
-11735
lines changed

6 files changed

+14037
-11735
lines changed

MainDemo.Uwp/MainDemo.Uwp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<AssemblyName>MainDemo.Uwp</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.10240.0</TargetPlatformVersion>
15-
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
14+
<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<EnableDotNetNativeCompatibleProfile>true</EnableDotNetNativeCompatibleProfile>
1818
<FileAlignment>512</FileAlignment>

MainDemo.Uwp/MainPage.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
<Button Margin="8 0 0 0" Width="100" Style="{StaticResource MaterialDesignRaisedDarkButton}">DARK</Button>
3333
<Button Margin="8 0 0 0" Width="100" Style="{StaticResource MaterialDesignRaisedAccentButton}">ACCENT</Button>
3434
</StackPanel>
35-
<ToggleSwitch Style="{StaticResource MaterialDesignToggleSwitch}" />
35+
<ToggleSwitch Style="{StaticResource MaterialDesignToggleSwitch}" />
36+
<CheckBox Style="{StaticResource MaterialDesignCheckBox}">Material Design</CheckBox>
3637
</StackPanel>
3738
</Grid>
3839
</Page>

0 commit comments

Comments
 (0)