Skip to content

Commit 4bf8b98

Browse files
niels9001karkarlJay-o-Way
authored
[Design guidance] Additional pages (#1531)
## Description - Updated the design guidance menu names to be inline with the docs (e.g. Icons => Iconography, Colors => Color) and sorted alphabetically. - Moved the Card stroke brush on the Stroke colors page to the top, so it's inline with the Card background brush and the control strokes are grouped. - Adding a bit more spacing between the color sections - Left aligned type ramp image on the Typography page - Added a new Geometry page explaining how to use the CornerRadius resources: ![image](https://github.com/microsoft/WinUI-Gallery/assets/9866362/962ffeff-3b70-4c92-bba8-131a43136664) - Added a new Spacing page showing a spacing ramp and some common UI examples with redlines: ![image](https://github.com/microsoft/WinUI-Gallery/assets/9866362/4f5656d2-f867-4905-a9b7-1e34010b213c) ## Motivation and Context <!--- Why is this change required? What problem does it solve? --> <!--- If it fixes an open issue, please link to the issue here. --> ## How Has This Been Tested? <!--- Please describe in detail how you tested your changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Screenshots (if appropriate): ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [ ] 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) --------- Co-authored-by: Karen Lai <biilai@microsoft.com> Co-authored-by: Jay <65828559+Jay-o-Way@users.noreply.github.com>
1 parent a1d0ca1 commit 4bf8b98

28 files changed

+740
-142
lines changed

WinUIGallery/App.xaml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<!-- Application-specific resources -->
4545
<x:String x:Key="ControlsName">All samples</x:String>
4646
<x:String x:Key="AppTitleName">WinUI 3 Gallery</x:String>
47-
47+
4848
<common:NullableBooleanToBooleanConverter x:Key="nullableBooleanToBooleanConverter" />
4949
<common:NullToVisibilityConverter x:Key="nullToVisibilityConverter" />
5050
<common:EmptyStringToVisibilityConverter x:Key="emptyStringToVisibilityConverter" />
@@ -58,11 +58,11 @@
5858
<!-- Breakpoints -->
5959
<x:Double x:Key="Breakpoint640Plus">641</x:Double>
6060

61-
<!-- Style Overrides -->
61+
<!-- Style Overrides -->
6262
<SolidColorBrush x:Key="GridViewHeaderItemDividerStroke" Color="Transparent" />
6363
<x:Double x:Key="TeachingTipMinWidth">50</x:Double>
64-
65-
<!-- Application-specific styles -->
64+
65+
<!-- Application-specific styles -->
6666
<Style
6767
x:Key="OutputTextBlockStyle"
6868
BasedOn="{StaticResource BodyTextBlockStyle}"
@@ -107,13 +107,30 @@
107107
<Setter Property="CornerRadius" Value="{StaticResource OverlayCornerRadius}" />
108108
</Style>
109109

110+
<Style x:Key="DesignRowCardStyle" TargetType="Grid">
111+
<Style.Setters>
112+
<Setter Property="HorizontalAlignment" Value="Stretch" />
113+
<Setter Property="MinHeight" Value="68" />
114+
<Setter Property="CornerRadius" Value="{StaticResource ControlCornerRadius}" />
115+
</Style.Setters>
116+
</Style>
117+
118+
<Style
119+
x:Key="DesignRowLightCardStyle"
120+
BasedOn="{StaticResource DesignRowCardStyle}"
121+
TargetType="Grid">
122+
<Style.Setters>
123+
<Setter Property="Background" Value="{ThemeResource CardBackgroundFillColorDefaultBrush}" />
124+
</Style.Setters>
125+
</Style>
126+
110127
<x:Double x:Key="ColorSectionSpacing">12</x:Double>
111128

112-
<!-- Icon Paths -->
129+
<!-- Icon Paths -->
113130
<x:String x:Key="GitHubIconPath">M21.7999992370605,0L19.220495223999,0.26007080078125 16.81787109375,1.00595712661743 14.6436157226563,2.18616962432861 12.7492189407349,3.74921894073486 11.1861696243286,5.64361572265625 10.0059566497803,7.81787109375 9.26007080078125,10.2204961776733 9,12.8000001907349 9.65248012542725,16.8459720611572 11.4694375991821,20.3591785430908 14.2401514053345,23.1291217803955 17.7539005279541,24.9453010559082 18.4305686950684,24.8080005645752 18.6273498535156,24.3296756744385 18.6207065582275,23.4247951507568 18.609375,21.9468746185303 16.4340572357178,22.0373229980469 15.1187467575073,21.4822216033936 14.4708204269409,20.7821025848389 14.2976503372192,20.4375 13.8297338485718,19.5214366912842 13.3685493469238,18.947265625 12.8765497207642,18.5656261444092 12.3995819091797,18.1091804504395 12.4844465255737,17.87890625 12.7874250411987,17.7974605560303 12.9647998809814,17.7875003814697 13.8134965896606,18.0311241149902 14.4276065826416,18.4802703857422 14.8007507324219,18.9127178192139 14.926549911499,19.1062507629395 15.8880548477173,20.1437015533447 16.9443283081055,20.494140625 17.9229640960693,20.416259765625 18.6515502929688,20.1687507629395 18.9645938873291,19.1242198944092 19.4640502929688,18.4593753814697 17.3543262481689,18.0241260528564 15.4833002090454,17.014066696167 14.1450357437134,15.1450166702271 13.6336002349854,12.1328001022339 13.9853601455688,10.2268438339233 14.9500007629395,8.69764995574951 14.7027282714844,7.54188776016235 14.7441072463989,6.53565359115601 15.0765495300293,5.30859994888306 15.2825078964233,5.28076791763306 15.9191312789917,5.34375619888306 17.0145378112793,5.71729135513306 18.596851348877,6.62109994888306 21.799976348877,6.19062519073486 25.004674911499,6.62265014648438 26.5845413208008,5.71818733215332 27.6791000366211,5.34472513198853 28.315746307373,5.28210020065308 28.5218753814697,5.31015014648438 28.8556652069092,6.53784370422363 28.8976573944092,7.5438346862793 28.6499996185303,8.69764995574951 29.6154251098633,10.2268533706665 29.9656257629395,12.1328001022339 29.453296661377,15.1497011184692 28.1123065948486,17.0164012908936 26.2366523742676,18.020601272583 24.120325088501,18.4500007629395 24.7275562286377,19.3355484008789 24.9890747070313,20.8187503814697 24.9804744720459,23.0584030151367 24.9718742370605,24.3312511444092 25.1693305969238,24.8128852844238 25.8531246185303,24.9453010559082 29.3641395568848,23.1273632049561 32.1326217651367,20.3568344116211 33.948070526123,16.8442134857178 34.5999984741211,12.8000001907349 34.3399276733398,10.2204961776733 33.5940399169922,7.81787109375 32.4138298034668,5.64361572265625 30.8507804870605,3.74921894073486 28.9563827514648,2.18616962432861 26.7821273803711,1.00595712661743 24.3795032501221,0.26007080078125 21.7999992370605,0z</x:String>
114-
131+
115132
<x:String x:Key="TemplateStudioIconPath">M39,30l-15,7.5-5-2.5v-9l-4-2v9l-3-1.5v-14.944l12,5.944,15.034-7.447L24,3.831,9,15.027v14.973L0,34.5l24,12,24-12-9-4.5ZM24,7.575v11.577l-9.323-4.618,9.323-6.959Z</x:String>
116-
133+
117134
</ResourceDictionary>
118135
</Application.Resources>
119136
</Application>
13.3 KB
Loading
17.2 KB
Loading
25.5 KB
Loading
24.8 KB
Loading
51 KB
Loading
53.9 KB
Loading

WinUIGallery/ControlPages/DesignGuidance/ColorsPage.xaml renamed to WinUIGallery/ControlPages/DesignGuidance/ColorPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- Licensed under the MIT License. -->
33

44
<Page
5-
x:Class="WinUIGallery.ControlPages.ColorsPage"
5+
x:Class="WinUIGallery.ControlPages.ColorPage"
66
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
77
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
88
xmlns:controls1="using:WinUIGallery.DesktopWap.Controls"
@@ -23,7 +23,7 @@
2323
<RichTextBlock>
2424
<Paragraph>
2525
<Run>The brushes below are part of WinUI 3. You can reference them in your app using:</Run>
26-
<Run FontStyle="Italic">Foreground="{ThemeResource TextFillColorPrimaryBrush}".</Run>
26+
<Run FontStyle="Italic">Foreground="{ThemeResource TextFillColorPrimaryBrush}"</Run>.
2727
</Paragraph>
2828
</RichTextBlock>
2929
<SelectorBar

0 commit comments

Comments
 (0)