From 302b0f36fe85f5f37a0009f5ad55c544aa3951bf Mon Sep 17 00:00:00 2001
From: Ada <adabingw@yahoo.com>
Date: Thu, 23 May 2024 19:42:06 -0400
Subject: [PATCH] 363 Macro test overlap and UI fixes

---
 dashboard/src/components/Instance/InstanceSettings.tsx | 4 ++--
 dashboard/src/pages/macros.tsx                         | 2 +-
 dashboard/src/pages/settings.tsx                       | 2 +-
 dashboard/src/pages/settings/CoreSettings.tsx          | 2 +-
 dashboard/src/pages/settings/UserSettings.tsx          | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dashboard/src/components/Instance/InstanceSettings.tsx b/dashboard/src/components/Instance/InstanceSettings.tsx
index cd6ee419..45cacbf5 100644
--- a/dashboard/src/components/Instance/InstanceSettings.tsx
+++ b/dashboard/src/components/Instance/InstanceSettings.tsx
@@ -78,7 +78,7 @@ export default function InstanceSetting() {
           key={section.section_id}
           className="mb-16 flex flex-col gap-4 @4xl:flex-row"
         >
-          <div className="w-80 shrink-0">
+          <div className="w-full shrink-0">
             <h2 className="text-h2 font-extrabold tracking-medium">
               {section.name}
             </h2>
@@ -119,7 +119,7 @@ export default function InstanceSetting() {
         </div>
       ))}
       <div className="mb-16 flex flex-col gap-4 @4xl:flex-row">
-        <div className="w-80 shrink-0">
+        <div className="w-full shrink-0">
           <h2 className="text-h2 font-extrabold tracking-medium">
             Danger Zone
           </h2>
diff --git a/dashboard/src/pages/macros.tsx b/dashboard/src/pages/macros.tsx
index 4251fd94..45c11af2 100644
--- a/dashboard/src/pages/macros.tsx
+++ b/dashboard/src/pages/macros.tsx
@@ -241,7 +241,7 @@ const Macros = () => {
           onClick={() => setShowCreateMacro(true)}
         />
       </div> */}
-      <div className="mt-[-3rem] mb-4">All macros for your instance</div>
+      <div className="mb-4">All macros for your instance</div>
       <div className="flex flex-row justify-start border-b border-gray-400">
         {pages.map((page) => (
           <button
diff --git a/dashboard/src/pages/settings.tsx b/dashboard/src/pages/settings.tsx
index 01506d5b..9d03dcc7 100644
--- a/dashboard/src/pages/settings.tsx
+++ b/dashboard/src/pages/settings.tsx
@@ -23,7 +23,7 @@ const SettingsPage = () => {
 
   return (
     // used to possibly center the content
-    <div className="relative mx-auto flex h-full w-full max-w-2xl flex-row justify-center @container">
+    <div className="relative mx-auto flex h-full w-full flex-row justify-center @container">
       <div className="flex w-full grow flex-col items-stretch gap-2 px-4 pt-8">
         <div className="flex min-w-0 flex-row items-center gap-4">
           <h1 className="dashboard-instance-heading">Core Settings</h1>
diff --git a/dashboard/src/pages/settings/CoreSettings.tsx b/dashboard/src/pages/settings/CoreSettings.tsx
index 870fa0f2..fabbf42d 100644
--- a/dashboard/src/pages/settings/CoreSettings.tsx
+++ b/dashboard/src/pages/settings/CoreSettings.tsx
@@ -317,7 +317,7 @@ export const CoreSettings = () => {
                 These settings can cause irreversible damage to your server!
               </h3>
             </div>
-            <div className="w-full rounded-lg border border-red-faded child:w-full child:border-b child:border-gray-faded/30 first:child:rounded-t-lg last:child:rounded-b-lg last:child:border-b-0">
+            <div className="w-full rounded-lg border border-red-faded child:w-full child:border-b child:border-gray-faded/30 first:child:rounded-t-lg last:child:rounded-b-lg last:child:border-b-0 mb-10">
               {unsafeModeField}
               {openPortField}
             </div>
diff --git a/dashboard/src/pages/settings/UserSettings.tsx b/dashboard/src/pages/settings/UserSettings.tsx
index 0d1f134d..73478410 100644
--- a/dashboard/src/pages/settings/UserSettings.tsx
+++ b/dashboard/src/pages/settings/UserSettings.tsx
@@ -330,7 +330,7 @@ export const UserSettings = () => {
           </div>
         </Dialog>
       </Transition>
-      <div className="relative mx-auto flex h-full w-full max-w-2xl flex-row justify-center @container">
+      <div className="relative mx-auto flex h-full w-full max-w-2xl flex-row justify-center @container mb-10">
         <div className="flex w-full flex-col gap-12 overflow-y-scroll px-4 pt-8">
           <h1 className="dashboard-instance-heading">User Settings</h1>
           {UserBoxes}