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

Jump to bottom

[Gallery] Minor tweaks #128

Merged
merged 3 commits into from
Aug 29, 2023
Merged

[Gallery] Minor tweaks #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a287507
Removing gap
niels9001 Aug 29, 2023
7f43390
Addings links to About section
niels9001 Aug 29, 2023
fae2792
Adding docs button
niels9001 Aug 29, 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
23 changes: 22 additions & 1 deletion CommunityToolkit.App.Shared/Pages/GettingStartedPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
<Page x:Class="CommunityToolkit.App.Shared.Pages.GettingStartedPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
Expand Down Expand Up @@ -89,6 +89,26 @@
<StackPanel Margin="0,16,0,0"
Orientation="Vertical"
Spacing="8">

<Button win:AutomationProperties.Name="Documentation on Learn">
<Button.Content>
<StackPanel Orientation="Horizontal"
Spacing="11">
<FontIcon VerticalAlignment="Center"
FontSize="15"
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
Glyph="&#xE8A5;" />
<TextBlock VerticalAlignment="Center"
Foreground="{ThemeResource TextFillColorPrimaryBrush}"
Text="Documentation on Learn" />
</StackPanel>
</Button.Content>
<interactivity:Interaction.Behaviors>
<interactions:EventTriggerBehavior EventName="Click">
<behaviors:NavigateToUriAction NavigateUri="https://aka.ms/toolkit/docs" />
</interactions:EventTriggerBehavior>
</interactivity:Interaction.Behaviors>
</Button>
<Button win:AutomationProperties.Name="Learn more on GitHub">
<Button.Content>
<StackPanel Orientation="Horizontal"
Expand All @@ -107,6 +127,7 @@
</interactions:EventTriggerBehavior>
</interactivity:Interaction.Behaviors>
</Button>

<Button win:AutomationProperties.Name="Join us on Discord">
<Button.Content>
<StackPanel VerticalAlignment="Center"
Expand Down
17 changes: 15 additions & 2 deletions CommunityToolkit.App.Shared/Pages/SettingsPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@
Text="About" />

<controls:SettingsExpander Description="© 2023. All rights reserved."
Header="Windows Community Toolkit Gallery">
Header="Windows Community Toolkit Gallery"
IsExpanded="True">
<controls:SettingsExpander.HeaderIcon>
<BitmapIcon ShowAsMonochrome="False"
UriSource="ms-appx:///Assets/AppTitleBar.png" />
</controls:SettingsExpander.HeaderIcon>
<TextBlock win:IsTextSelectionEnabled="True"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Style="{StaticResource CaptionTextBlockStyle}"
Text="Version 8.0.0" />
<controls:SettingsExpander.Items>
<controls:SettingsCard HorizontalContentAlignment="Left"
Expand All @@ -101,6 +101,19 @@
NavigateUri="https://aka.ms/colorcode" />
</StackPanel>
</controls:SettingsCard>
<controls:SettingsCard HorizontalContentAlignment="Left"
ContentAlignment="Vertical"
Header="Useful links">
<StackPanel Margin="-12,0,0,0"
Orientation="Vertical">
<HyperlinkButton Content="GitHub repository"
NavigateUri="https://aka.ms/toolkit/windows" />
<HyperlinkButton Content="Documentation"
NavigateUri="https://aka.ms/toolkit/docs" />
<HyperlinkButton Content="UWP Community Discord"
NavigateUri="https://aka.ms/wct/discord" />
</StackPanel>
</controls:SettingsCard>
</controls:SettingsExpander.Items>
</controls:SettingsExpander>
</StackPanel>
Expand Down
1 change: 0 additions & 1 deletion CommunityToolkit.App.Shared/Pages/Shell.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
</controls:TitleBar>
<muxc:NavigationView x:Name="NavView"
Grid.Row="1"
Margin="0,16,0,0"
IsBackButtonVisible="Collapsed"
IsPaneToggleButtonVisible="False"
ItemInvoked="NavView_ItemInvoked">
Expand Down
Loading