From 5255fe222b08a09720389ddd348f41ae04151bd1 Mon Sep 17 00:00:00 2001
From: Kristen Schau <47155823+krschau@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:05:59 -0400
Subject: [PATCH 1/6] Move scrollviewer in Setttings
---
settings/DevHome.Settings/Views/AboutPage.xaml | 11 ++++-------
.../DevHome.Settings/Views/AccountsPage.xaml | 10 ++++------
.../Views/ExperimentalFeaturesPage.xaml | 10 ++++------
.../DevHome.Settings/Views/FeedbackPage.xaml | 12 +++++-------
.../Views/PreferencesPage.xaml | 18 ++++++++----------
.../DevHome.Settings/Views/SettingsPage.xaml | 10 ++++------
6 files changed, 29 insertions(+), 42 deletions(-)
diff --git a/settings/DevHome.Settings/Views/AboutPage.xaml b/settings/DevHome.Settings/Views/AboutPage.xaml
index dfcd78fbac..aa2534be47 100644
--- a/settings/DevHome.Settings/Views/AboutPage.xaml
+++ b/settings/DevHome.Settings/Views/AboutPage.xaml
@@ -26,11 +26,8 @@
-
-
-
+
+
@@ -57,6 +54,6 @@
ActionIcon="{ui:FontIcon Glyph=}" />
-
-
+
+
diff --git a/settings/DevHome.Settings/Views/AccountsPage.xaml b/settings/DevHome.Settings/Views/AccountsPage.xaml
index 9adf0a9e16..be98c9b3a5 100644
--- a/settings/DevHome.Settings/Views/AccountsPage.xaml
+++ b/settings/DevHome.Settings/Views/AccountsPage.xaml
@@ -51,10 +51,8 @@
-
-
+
+
@@ -84,6 +82,6 @@
HorizontalAlignment="Stretch" VerticalAlignment="Center">
-
-
+
+
diff --git a/settings/DevHome.Settings/Views/ExperimentalFeaturesPage.xaml b/settings/DevHome.Settings/Views/ExperimentalFeaturesPage.xaml
index b1d412f910..765bbb0112 100644
--- a/settings/DevHome.Settings/Views/ExperimentalFeaturesPage.xaml
+++ b/settings/DevHome.Settings/Views/ExperimentalFeaturesPage.xaml
@@ -32,10 +32,8 @@
-
-
+
+
@@ -60,6 +58,6 @@
x:Uid="Settings_ExperimentalFeatures_NoExperimentalFeatures"
Visibility="{x:Bind ViewModel.ExperimentalFeatures.Count, Converter={StaticResource CountToVisibilityConverter}, Mode=OneWay}" />
-
-
+
+
diff --git a/settings/DevHome.Settings/Views/FeedbackPage.xaml b/settings/DevHome.Settings/Views/FeedbackPage.xaml
index 3b33d84611..f404a8eea9 100644
--- a/settings/DevHome.Settings/Views/FeedbackPage.xaml
+++ b/settings/DevHome.Settings/Views/FeedbackPage.xaml
@@ -29,11 +29,9 @@
-
-
-
+
+
+
@@ -167,6 +165,6 @@
-
-
+
+
diff --git a/settings/DevHome.Settings/Views/PreferencesPage.xaml b/settings/DevHome.Settings/Views/PreferencesPage.xaml
index c4e11932c2..6575d91b94 100644
--- a/settings/DevHome.Settings/Views/PreferencesPage.xaml
+++ b/settings/DevHome.Settings/Views/PreferencesPage.xaml
@@ -2,12 +2,12 @@
x:Class="DevHome.Settings.Views.PreferencesPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- xmlns:behaviors="using:DevHome.Common.Behaviors"
xmlns:ctControls="using:CommunityToolkit.WinUI.Controls"
- xmlns:i="using:Microsoft.Xaml.Interactivity"
+ xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
xmlns:xaml="using:Microsoft.UI.Xaml"
xmlns:viewmodels="using:DevHome.Settings.ViewModels"
+ xmlns:behaviors="using:DevHome.Common.Behaviors"
behaviors:NavigationViewHeaderBehavior.HeaderContext="{x:Bind ViewModel}"
Loaded="Page_Loaded">
@@ -27,12 +27,10 @@
-
-
-
-
+
+
+
@@ -48,6 +46,6 @@
-
-
+
+
diff --git a/settings/DevHome.Settings/Views/SettingsPage.xaml b/settings/DevHome.Settings/Views/SettingsPage.xaml
index 529d7dbc21..1a8d064652 100644
--- a/settings/DevHome.Settings/Views/SettingsPage.xaml
+++ b/settings/DevHome.Settings/Views/SettingsPage.xaml
@@ -28,10 +28,8 @@
-
-
+
+
@@ -44,6 +42,6 @@
-
-
+
+
From 8798b24eb06a2b6b492ee5f30f6169cc900af905 Mon Sep 17 00:00:00 2001
From: Kristen Schau <47155823+krschau@users.noreply.github.com>
Date: Fri, 15 Mar 2024 12:06:34 -0400
Subject: [PATCH 2/6] Move scrollviewer in Dashboard
---
.../Dashboard/DevHome.Dashboard/Views/DashboardView.xaml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml b/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml
index 0c02bf3f56..22512232aa 100644
--- a/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml
+++ b/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml
@@ -44,16 +44,17 @@
-
+
-
+
-
+