Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Design Guidance section #1167

Merged
merged 52 commits into from
Feb 3, 2023
Merged

Design Guidance section #1167

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
7e05e5b
Initial WIP
marcelwgn Sep 29, 2022
d94c9fb
Switch to ellipses trimming for overflow on icons name
marcelwgn Sep 30, 2022
96d490f
First design updates
marcelwgn Oct 16, 2022
f2fe33c
Add broken itemsrepeater
marcelwgn Oct 18, 2022
5a4b4da
Small ui update
marcelwgn Oct 19, 2022
5a0c5d5
Add screen reader page
marcelwgn Oct 21, 2022
363e2c6
Add more accessibility pages
marcelwgn Oct 23, 2022
2b5bd4f
Redesign icons page, refactor color picker into a new control
marcelwgn Oct 24, 2022
121d406
Add icons page
marcelwgn Nov 1, 2022
fa7ea34
Fix faulty icon glyph
marcelwgn Nov 9, 2022
a395750
Got the page + image
gregwoo-microsoft Jan 12, 2023
3300701
Typography page working
gregwoo-microsoft Jan 13, 2023
b9d17ad
Tweaks
niels9001 Jan 16, 2023
9766e50
Merge pull request #1 from niels9001/user/niels9001/typoimprovements
gregwoo-microsoft Jan 20, 2023
e1269ec
Merge remote-tracking branch 'gregwoo-microsoft/typography' into dev/…
marcelwgn Jan 23, 2023
c703916
Merge icon and accessibility pages into design guidance section
marcelwgn Jan 23, 2023
ba61e16
Merge pull request #3 from chingucoding/dev/merge-icon-page
gregwoo-microsoft Jan 24, 2023
c758c42
Moved files to "Design Guidance" folder + a few tweaks
gregwoo-microsoft Jan 26, 2023
8c34d1f
Switch to control data based itempages for Design guidance pages
marcelwgn Jan 26, 2023
355a58e
Hide code links on design guidance pages
marcelwgn Jan 26, 2023
617518f
Replaced fontsize slider by combo box
gregwoo-microsoft Jan 27, 2023
146a071
Typography page fixes
gregwoo-microsoft Jan 28, 2023
e60337f
Icons page fixes
gregwoo-microsoft Jan 28, 2023
31bd270
Fixes to screen reader page
gregwoo-microsoft Jan 28, 2023
c761f32
Remove AutomaticPropertyPage
gregwoo-microsoft Jan 28, 2023
4ba2797
Fixes to Keyboard support page
gregwoo-microsoft Jan 28, 2023
98080bf
Fixes to contrast page
gregwoo-microsoft Jan 28, 2023
6219438
Added documentation links
gregwoo-microsoft Jan 28, 2023
70bb146
Minor fix to icons page
gregwoo-microsoft Jan 28, 2023
90300cc
Made the "design guidance" and "accessibility" menu pages inaccessibl…
gregwoo-microsoft Jan 28, 2023
6af69ed
Made icon tiles smaller + 32 default size
gregwoo-microsoft Jan 28, 2023
e945c41
Hide design guidance items from AllControlsPage
marcelwgn Jan 28, 2023
8775202
Make icons page responsive
marcelwgn Jan 28, 2023
6256785
Increase max width of a11y pages
marcelwgn Jan 28, 2023
f92ca05
Increase scroll padding on iconspage
marcelwgn Jan 28, 2023
87f584a
Move Design Guidance pages into ControlPages folder, code cleanup, ad…
marcelwgn Jan 28, 2023
88b9fbc
Add first color brushes section
Jan 30, 2023
282a6aa
Minor bug fix for typography + color contrast page
gregwoo-microsoft Jan 31, 2023
f8deea4
Small style changes to colors page
gregwoo-microsoft Jan 31, 2023
df1b7e0
Added documentation links + intro text
gregwoo-microsoft Jan 31, 2023
638148a
Minor tweak to icons page
gregwoo-microsoft Jan 31, 2023
970dc5b
Hiding related controls part
gregwoo-microsoft Jan 31, 2023
9601fcb
Add fill section for colors page
Jan 31, 2023
2b52a3b
CR feedback
marcelwgn Feb 1, 2023
f0e32a5
Add stroke section
marcelwgn Feb 1, 2023
9737a4f
Background brushes 2 of 6
marcelwgn Feb 2, 2023
d0bdfe2
Complete Background Section
Feb 2, 2023
af5b6ee
Add initial navigation, small touch ups
marcelwgn Feb 2, 2023
adeb9d2
Implement discussed changes
marcelwgn Feb 2, 2023
531a0b5
Merge branch 'main' into typography
niels9001 Feb 3, 2023
274fba6
Updated intro text of colors page
gregwoo-microsoft Feb 3, 2023
1810abf
Merge branch 'typography' of https://github.com/gregwoo-microsoft/Win…
gregwoo-microsoft Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions WinUIGallery/DataModel/ControlInfoData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"Content": "",
"IsNew": false,
"IsUpdated": false,
"HideSourceCodeLinks": true,
niels9001 marked this conversation as resolved.
Show resolved Hide resolved
"HideSourceCodeAndRelatedControls": true,
"Docs": [
{
"Title": "Typography in Windows Apps",
Expand Down Expand Up @@ -49,7 +49,7 @@
"Content": "",
"IsNew": false,
"IsUpdated": false,
"HideSourceCodeLinks": true,
"HideSourceCodeAndRelatedControls": true,
"Docs": [
{
"Title": "Iconography in Windows",
Expand All @@ -73,7 +73,7 @@
"Content": "",
"IsNew": false,
"IsUpdated": false,
"HideSourceCodeLinks": true,
"HideSourceCodeAndRelatedControls": true,
"Docs": [
{
"Title": "Colors in Windows 11",
Expand All @@ -100,7 +100,7 @@
"Content": "",
"IsNew": false,
"IsUpdated": false,
"HideSourceCodeLinks": true,
"HideSourceCodeAndRelatedControls": true,
"Docs": [
{
"Title": "Accessibility",
Expand All @@ -124,7 +124,7 @@
"Content": "",
"IsNew": false,
"IsUpdated": false,
"HideSourceCodeLinks": true,
"HideSourceCodeAndRelatedControls": true,
"Docs": [
{
"Title": "Accessibility",
Expand Down Expand Up @@ -152,7 +152,7 @@
"Content": "",
"IsNew": false,
"IsUpdated": false,
"HideSourceCodeLinks": true,
"HideSourceCodeAndRelatedControls": true,
"Docs": [
{
"Title": "Accessibility",
Expand Down
10 changes: 5 additions & 5 deletions WinUIGallery/DataModel/ControlInfoDataSource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace AppUIBasics.Data
/// </summary>
public class ControlInfoDataItem
{
public ControlInfoDataItem(string uniqueId, string title, string apiNamespace, string subtitle, string imagePath, string imageIconPath, string badgeString, string description, string content, bool isNew, bool isUpdated, bool isPreview, bool hideSourceCodeLinks)
public ControlInfoDataItem(string uniqueId, string title, string apiNamespace, string subtitle, string imagePath, string imageIconPath, string badgeString, string description, string content, bool isNew, bool isUpdated, bool isPreview, bool hideSourceCodeAndRelatedControls)
{
this.UniqueId = uniqueId;
this.Title = title;
Expand All @@ -47,7 +47,7 @@ public ControlInfoDataItem(string uniqueId, string title, string apiNamespace, s
this.IsPreview = isPreview;
this.Docs = new ObservableCollection<ControlInfoDocLink>();
this.RelatedControls = new ObservableCollection<string>();
this.HideSourceCodeLinks = hideSourceCodeLinks;
this.HideSourceCodeAndRelatedControls = hideSourceCodeAndRelatedControls;
}

public string UniqueId { get; private set; }
Expand All @@ -62,7 +62,7 @@ public ControlInfoDataItem(string uniqueId, string title, string apiNamespace, s
public bool IsNew { get; private set; }
public bool IsUpdated { get; private set; }
public bool IsPreview { get; private set; }
public bool HideSourceCodeLinks { get; private set; }
public bool HideSourceCodeAndRelatedControls { get; private set; }
public ObservableCollection<ControlInfoDocLink> Docs { get; private set; }
public ObservableCollection<string> RelatedControls { get; private set; }

Expand Down Expand Up @@ -246,7 +246,7 @@ private async Task GetControlInfoDataAsync()
badgeString = "Preview";
}

var hideSourceCodeLinks = itemObject.ContainsKey("HideSourceCodeLinks") ? itemObject["HideSourceCodeLinks"].GetBoolean() : false;
var hideSourceCodeAndRelatedControls = itemObject.ContainsKey("HideSourceCodeAndRelatedControls") ? itemObject["HideSourceCodeAndRelatedControls"].GetBoolean() : false;
var item = new ControlInfoDataItem(itemObject["UniqueId"].GetString(),
itemObject["Title"].GetString(),
itemObject["ApiNamespace"].GetString(),
Expand All @@ -259,7 +259,7 @@ private async Task GetControlInfoDataAsync()
isNew,
isUpdated,
isPreview,
hideSourceCodeLinks);
hideSourceCodeAndRelatedControls);

{
string pageString = pageRoot + item.UniqueId + "Page";
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/ItemPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
<ColumnDefinition />
</Grid.ColumnDefinitions>

<StackPanel x:Name="SourcePanel" Grid.Row="0" Grid.ColumnSpan="3" Margin="0,0,0,24" Spacing="4" Visibility="{x:Bind Item.HideSourceCodeLinks,Mode=OneWay, Converter={StaticResource BooleanToInvertedVisibilityConverter}}">
<StackPanel x:Name="SourcePanel" Grid.Row="0" Grid.ColumnSpan="3" Margin="0,0,0,24" Spacing="4" Visibility="{x:Bind Item.HideSourceCodeAndRelatedControls,Mode=OneWay, Converter={StaticResource BooleanToInvertedVisibilityConverter}}">
<TextBlock
x:Name="SourceHeader"
x:Uid="SourceHeader"
Expand Down Expand Up @@ -201,7 +201,7 @@
</ItemsControl>
</StackPanel>

<StackPanel x:Name="RelatedControlsPanel" Grid.Row="2" Grid.ColumnSpan="3" Margin="0,0,0,24">
<StackPanel x:Name="RelatedControlsPanel" Grid.Row="2" Grid.ColumnSpan="3" Margin="0,0,0,24" Visibility="{x:Bind Item.HideSourceCodeAndRelatedControls,Mode=OneWay, Converter={StaticResource BooleanToInvertedVisibilityConverter}}">
<TextBlock
x:Name="relatedControlsHeader"
x:Uid="RelatedControlsHeader"
Expand Down