Skip to content

Commit ebe04a1

Browse files
committed
updated font sizes
1 parent 8b13625 commit ebe04a1

File tree

3 files changed

+35
-30
lines changed

3 files changed

+35
-30
lines changed

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HamburgerMenu/HamburgerMenuCode.bind

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<ColumnDefinition />
1717
</Grid.ColumnDefinitions>
1818
<FontIcon Grid.Column="0"
19+
FontSize="16"
1920
FontFamily="Segoe MDL2 Assets"
2021
Glyph="{Binding Glyph}"
2122
Foreground="White" />

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/HamburgerMenu/HamburgerMenuPage.xaml

Lines changed: 32 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,41 @@
77
mc:Ignorable="d">
88

99
<Page.Resources>
10-
<DataTemplate x:Key="HamburgerMenuItem" x:DataType="controls:HamburgerMenuGlyphItem">
10+
<DataTemplate x:Key="HamburgerMenuItem"
11+
x:DataType="controls:HamburgerMenuGlyphItem">
1112
<Grid>
1213
<Grid.ColumnDefinitions>
1314
<ColumnDefinition Width="48" />
1415
<ColumnDefinition />
1516
</Grid.ColumnDefinitions>
16-
<FontIcon Grid.Column="0"
17-
FontFamily="Segoe MDL2 Assets"
18-
Glyph="{Binding Glyph}"
19-
Foreground="White" />
20-
<TextBlock Grid.Column="1"
21-
Text="{x:Bind Label}"
22-
Foreground="White"
23-
FontSize="16"
24-
VerticalAlignment="Center" />
17+
<FontIcon Grid.Column="0"
18+
FontFamily="Segoe MDL2 Assets"
19+
FontSize="16"
20+
Foreground="White"
21+
Glyph="{Binding Glyph}" />
22+
<TextBlock Grid.Column="1"
23+
VerticalAlignment="Center"
24+
FontSize="16"
25+
Foreground="White"
26+
Text="{x:Bind Label}" />
2527
</Grid>
2628
</DataTemplate>
2729

28-
<DataTemplate x:Key="HamburgerMenuImageItem" x:DataType="controls:HamburgerMenuImageItem">
30+
<DataTemplate x:Key="HamburgerMenuImageItem"
31+
x:DataType="controls:HamburgerMenuImageItem">
2932
<Grid>
3033
<Grid.ColumnDefinitions>
3134
<ColumnDefinition Width="48" />
3235
<ColumnDefinition />
3336
</Grid.ColumnDefinitions>
34-
<Image Source="{Binding Thumbnail}"
35-
Stretch="UniformToFill"
36-
Margin="16,12" />
37-
<TextBlock Grid.Column="1"
38-
Text="{x:Bind Label}"
39-
Foreground="White"
40-
FontSize="16"
41-
VerticalAlignment="Center" />
37+
<Image Margin="16,12"
38+
Source="{Binding Thumbnail}"
39+
Stretch="UniformToFill" />
40+
<TextBlock Grid.Column="1"
41+
VerticalAlignment="Center"
42+
FontSize="16"
43+
Foreground="White"
44+
Text="{x:Bind Label}" />
4245
</Grid>
4346
</DataTemplate>
4447
</Page.Resources>
@@ -49,27 +52,27 @@
4952
CompactPaneLength="{Binding CompactPaneLength.Value}"
5053
DisplayMode="{Binding DisplayMode.Value}"
5154
Foreground="White"
52-
ItemTemplate="{StaticResource HamburgerMenuImageItem}"
53-
OptionsItemTemplate="{StaticResource HamburgerMenuItem}"
5455
HamburgerHeight="{Binding HamburgerHeight.Value}"
5556
HamburgerVisibility="{Binding HamburgerVisibility.Value}"
5657
HamburgerWidth="48"
5758
IsPaneOpen="{Binding IsPaneOpen.Value, Mode=TwoWay}"
5859
ItemClick="HamburgerMenu_OnItemClick"
60+
ItemTemplate="{StaticResource HamburgerMenuImageItem}"
5961
OpenPaneLength="{Binding OpenPaneLength.Value}"
6062
OptionsItemClick="HamburgerMenu_OnOptionsItemClick"
63+
OptionsItemTemplate="{StaticResource HamburgerMenuItem}"
6164
PaneBackground="{Binding PaneBackground.Value}">
6265
<!-- Items -->
6366
<controls:HamburgerMenu.ItemsSource>
6467
<controls:HamburgerMenuItemCollection>
65-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg"
66-
Label="Big four summer heat" />
67-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg"
68-
Label="Bison badlands Chillin" />
69-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg"
70-
Label="Giant slab in Oregon" />
71-
<controls:HamburgerMenuImageItem Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg"
72-
Label="Lake Ann Mushroom" />
68+
<controls:HamburgerMenuImageItem Label="Big four summer heat"
69+
Thumbnail="ms-appx:///Assets/Photos/BigFourSummerHeat.jpg" />
70+
<controls:HamburgerMenuImageItem Label="Bison badlands Chillin"
71+
Thumbnail="ms-appx:///Assets/Photos/BisonBadlandsChillin.jpg" />
72+
<controls:HamburgerMenuImageItem Label="Giant slab in Oregon"
73+
Thumbnail="ms-appx:///Assets/Photos/GiantSlabInOregon.jpg" />
74+
<controls:HamburgerMenuImageItem Label="Lake Ann Mushroom"
75+
Thumbnail="ms-appx:///Assets/Photos/LakeAnnMushroom.jpg" />
7376
</controls:HamburgerMenuItemCollection>
7477
</controls:HamburgerMenu.ItemsSource>
7578

Microsoft.Toolkit.Uwp.SampleApp/Shell.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@
4444
</Grid.ColumnDefinitions>
4545
<FontIcon Grid.Column="0"
4646
FontFamily="Segoe MDL2 Assets"
47+
FontSize="16"
4748
Foreground="White"
48-
Glyph="{x:Bind Glyph}"/>
49+
Glyph="{x:Bind Glyph}" />
4950
<TextBlock Grid.Column="1"
5051
VerticalAlignment="Center"
5152
FontSize="16"

0 commit comments

Comments
 (0)