From 3cf9d40930dbf02c0f866b57d74fdcc989e98cf8 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 3 Dec 2024 15:03:53 +0000
Subject: [PATCH 1/2] Fix padding on Device Group Settings view

---
 frontend/src/pages/application/DeviceGroup/Settings/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/application/DeviceGroup/Settings/index.vue b/frontend/src/pages/application/DeviceGroup/Settings/index.vue
index bdf143b19..ef3059805 100644
--- a/frontend/src/pages/application/DeviceGroup/Settings/index.vue
+++ b/frontend/src/pages/application/DeviceGroup/Settings/index.vue
@@ -2,7 +2,7 @@
     <div class="mb-3">
         <SectionTopMenu hero="Device Group Settings" info="" />
     </div>
-    <div class="flex flex-col sm:flex-row">
+    <div class="flex flex-col sm:flex-row ml-6">
         <SectionSideMenu :options="sideNavigation" />
         <div class="flex-grow">
             <router-view :deviceGroup="deviceGroup" :application="application" @device-group-updated="onDeviceGroupUpdated" />

From bfe85a57fb97a7c91670df5d76f9e301a9548d69 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 5 Dec 2024 14:04:33 +0000
Subject: [PATCH 2/2] Fix left margin padding consistently

---
 frontend/src/components/SectionSideMenu.vue                   | 2 +-
 frontend/src/pages/account/index.vue                          | 2 +-
 frontend/src/pages/application/DeviceGroup/Settings/index.vue | 2 +-
 frontend/src/pages/device/index.vue                           | 2 +-
 frontend/src/pages/instance/Settings/index.vue                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/SectionSideMenu.vue b/frontend/src/components/SectionSideMenu.vue
index e5759b97e..0ecde32c4 100644
--- a/frontend/src/components/SectionSideMenu.vue
+++ b/frontend/src/components/SectionSideMenu.vue
@@ -1,5 +1,5 @@
 <template>
-    <ul class="mb-6 sm:mb-0 sm:-ml-6 w-full pb-4 sm:pb-0 sm:w-32 border-b sm:border-b-0 sm:border-r overflow-hidden border-gray-400 mr-6 text-gray-500 space-y-2" data-el="section-side-menu">
+    <ul class="mb-6 sm:mb-0 w-full pb-4 sm:pb-0 sm:w-32 border-b sm:border-b-0 sm:border-r overflow-hidden border-gray-400 mr-6 text-gray-500 space-y-2" data-el="section-side-menu">
         <template v-for="item in options" :key="item.name">
             <li class="block">
                 <router-link :to="item.path" class="block text-sm px-3 py-1 sm:py-2 pl-3 ml-1" exact-active-class="text-blue-700 ml-0 border-l-4 border-blue-700" :data-nav="item.name.toLowerCase()">{{ item.name }}</router-link>
diff --git a/frontend/src/pages/account/index.vue b/frontend/src/pages/account/index.vue
index 44107d25b..fe8a146c6 100644
--- a/frontend/src/pages/account/index.vue
+++ b/frontend/src/pages/account/index.vue
@@ -7,7 +7,7 @@
                 <div class="text-l text-gray-400">{{ user.username }}</div>
             </div>
         </div>
-        <div class="text-sm sm:px-6 mt-4 sm:mt-8">
+        <div class="text-sm mt-4 sm:mt-8">
             <router-view />
         </div>
     </ff-page>
diff --git a/frontend/src/pages/application/DeviceGroup/Settings/index.vue b/frontend/src/pages/application/DeviceGroup/Settings/index.vue
index ef3059805..bdf143b19 100644
--- a/frontend/src/pages/application/DeviceGroup/Settings/index.vue
+++ b/frontend/src/pages/application/DeviceGroup/Settings/index.vue
@@ -2,7 +2,7 @@
     <div class="mb-3">
         <SectionTopMenu hero="Device Group Settings" info="" />
     </div>
-    <div class="flex flex-col sm:flex-row ml-6">
+    <div class="flex flex-col sm:flex-row">
         <SectionSideMenu :options="sideNavigation" />
         <div class="flex-grow">
             <router-view :deviceGroup="deviceGroup" :application="application" @device-group-updated="onDeviceGroupUpdated" />
diff --git a/frontend/src/pages/device/index.vue b/frontend/src/pages/device/index.vue
index 330c1627f..59a5d03a4 100644
--- a/frontend/src/pages/device/index.vue
+++ b/frontend/src/pages/device/index.vue
@@ -49,7 +49,7 @@
                 </template>
             </SectionNavigationHeader>
         </div>
-        <div class="sm:px-6 mt-4 sm:mt-8">
+        <div class="mt-4 sm:mt-8">
             <Teleport v-if="mounted && isVisitingAdmin" to="#platform-banner">
                 <div class="ff-banner" data-el="banner-device-as-admin">You are viewing this device as an Administrator</div>
             </Teleport>
diff --git a/frontend/src/pages/instance/Settings/index.vue b/frontend/src/pages/instance/Settings/index.vue
index 52054cb9a..10eb60e57 100644
--- a/frontend/src/pages/instance/Settings/index.vue
+++ b/frontend/src/pages/instance/Settings/index.vue
@@ -2,7 +2,7 @@
     <div class="mb-3">
         <SectionTopMenu hero="Settings" info="" />
     </div>
-    <div class="flex flex-col sm:flex-row ml-6">
+    <div class="flex flex-col sm:flex-row">
         <SectionSideMenu :options="sideNavigation" />
         <div class="flex-grow">
             <router-view