Skip to content

Commit d039662

Browse files
Jay-o-Waykarkarl
authored andcommitted
Details on new pages (#1545)
## Description Few small things ## Motivation and Context ...that weren't perfect I would also suggest this icon (yay or nay?) ![image](https://github.com/microsoft/WinUI-Gallery/assets/65828559/880ee6bc-bab3-4ba7-9c6b-5642dab23a85) ## Screenshots (if appropriate): (before) ![image](https://github.com/microsoft/WinUI-Gallery/assets/65828559/61dfb1d4-3f72-4d46-92fe-95a8ff62f7ad) ## Types of changes - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change)
1 parent 7351dc3 commit d039662

2 files changed

Lines changed: 7 additions & 18 deletions

File tree

WinUIGallery/ControlPages/DesignGuidance/GeometryPage.xaml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@
6666
Canvas.Left="16"
6767
Canvas.Top="16"
6868
Padding="4"
69-
HorizontalAlignment="Right"
70-
VerticalAlignment="Top"
7169
AutomationProperties.Name="Show Geometry"
7270
Canvas.ZIndex="1"
7371
Click="ShowGeometryButtonClick1"
@@ -86,8 +84,6 @@
8684
Canvas.Left="16"
8785
Canvas.Top="148"
8886
Padding="4"
89-
HorizontalAlignment="Right"
90-
VerticalAlignment="Top"
9187
AutomationProperties.Name="Show Geometry"
9288
Canvas.ZIndex="1"
9389
Click="ShowGeometryButtonClick2"
@@ -99,14 +95,12 @@
9995
Title="0px"
10096
Target="{x:Bind ShowGeometryButton2}" />
10197

102-
<!-- Body Strong Teaching tip -->
98+
<!-- Control Teaching tip -->
10399
<Button
104100
x:Name="ShowGeometryButton3"
105101
Canvas.Left="240"
106102
Canvas.Top="168"
107103
Padding="4"
108-
HorizontalAlignment="Right"
109-
VerticalAlignment="Top"
110104
AutomationProperties.Name="Show geometry"
111105
Canvas.ZIndex="1"
112106
Click="ShowGeometryButtonClick3"
@@ -249,7 +243,6 @@
249243
Style="{StaticResource CaptionTextBlockStyle}"
250244
Text="N/a" />
251245
</Grid>
252-
253246
</StackPanel>
254247
</ScrollViewer>
255248
</StackPanel>

WinUIGallery/ControlPages/DesignGuidance/SpacingPage.xaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
<Setter Property="Background" Value="{ThemeResource AccentFillColorDefaultBrush}" />
6161
</Style.Setters>
6262
</Style>
63-
6463
</ResourceDictionary>
6564
</Page.Resources>
65+
6666
<Grid>
6767
<Grid.RowDefinitions>
6868
<RowDefinition Height="Auto" />
@@ -106,12 +106,14 @@
106106
</Grid>
107107
</StackPanel>
108108
</ScrollView>
109+
109110
<Grid
110111
Grid.Row="2"
111112
Margin="0,36,0,0"
112113
Style="{StaticResource GalleryTileGridStyle}">
113114
<ScrollViewer HorizontalScrollBarVisibility="Auto" HorizontalScrollMode="Auto">
114115
<StackPanel Padding="12,24,12,12">
116+
<!-- header -->
115117
<Grid Margin="16,0,0,0" HorizontalAlignment="Stretch">
116118
<Grid.ColumnDefinitions>
117119
<ColumnDefinition Width="206" />
@@ -143,9 +145,7 @@
143145
<TextBlock Style="{StaticResource DescriptionTextStyle}" Text="Spacing between UI controls, control + label." />
144146
</Grid>
145147
<!-- 12epx -->
146-
<Grid
147-
Grid.ColumnDefinitions="86,136,*"
148-
Style="{StaticResource DesignRowLightCardStyle}">
148+
<Grid Grid.ColumnDefinitions="86,136,*" Style="{StaticResource DesignRowLightCardStyle}">
149149
<TextBlock Style="{StaticResource ValueTextStyle}" Text="12epx" />
150150
<Border Width="12" Style="{StaticResource VisualBorderStyle}" />
151151
<TextBlock Style="{StaticResource DescriptionTextStyle}" Text="Spacing between control + header, surface and edge text, text sections." />
@@ -157,9 +157,7 @@
157157
<TextBlock Style="{StaticResource DescriptionTextStyle}" Text="Padding used in list styles, cards." />
158158
</Grid>
159159
<!-- 24epx -->
160-
<Grid
161-
Style="{StaticResource DesignRowLightCardStyle}"
162-
Grid.ColumnDefinitions="86,136,*">
160+
<Grid Grid.ColumnDefinitions="86,136,*" Style="{StaticResource DesignRowLightCardStyle}">
163161
<TextBlock Style="{StaticResource ValueTextStyle}" Text="24epx" />
164162
<Border Width="24" Style="{StaticResource VisualBorderStyle}" />
165163
<TextBlock Style="{StaticResource DescriptionTextStyle}" Text="Spacing between content sections." />
@@ -171,9 +169,7 @@
171169
<TextBlock Style="{StaticResource DescriptionTextStyle}" Text="Padding on pages." />
172170
</Grid>
173171
<!-- 48epx -->
174-
<Grid
175-
Style="{StaticResource DesignRowCardStyle}"
176-
Grid.ColumnDefinitions="86,136,*">
172+
<Grid Grid.ColumnDefinitions="86,136,*" Style="{StaticResource DesignRowLightCardStyle}">
177173
<TextBlock Style="{StaticResource ValueTextStyle}" Text="48epx" />
178174
<Border Width="48" Style="{StaticResource VisualBorderStyle}" />
179175
<TextBlock Style="{StaticResource DescriptionTextStyle}" Text="Spacing between page sections with title." />

0 commit comments

Comments
 (0)