From 5ec13bcc7e1a947d2581798fd21e08c89621d747 Mon Sep 17 00:00:00 2001
From: sreehari jayaraj <sreeharivijaya2003@gmail.com>
Date: Thu, 28 Sep 2023 11:23:49 +0530
Subject: [PATCH] fix: allignment

---
 packages/nc-gui/components/account/Profile.vue        | 2 +-
 packages/nc-gui/components/account/SignupSettings.vue | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/account/Profile.vue b/packages/nc-gui/components/account/Profile.vue
index db959d808a..53af6808d2 100644
--- a/packages/nc-gui/components/account/Profile.vue
+++ b/packages/nc-gui/components/account/Profile.vue
@@ -63,7 +63,7 @@ const onValidate = async (_: any, valid: boolean) => {
 <template>
   <div class="flex flex-col items-center">
     <div class="flex flex-col w-150">
-      <div class="flex font-medium text-xl">{{ $t('labels.profile') }}</div>
+      <div class="flex font-bold text-xl">{{ $t('labels.profile') }}</div>
       <div class="mt-5 flex flex-col border-1 rounded-2xl border-gray-200 p-6 gap-y-2">
         <div class="flex font-medium text-base">{{ $t('labels.accountDetails') }}</div>
         <div class="flex text-gray-500">{{ $t('labels.controlAppearance') }}</div>
diff --git a/packages/nc-gui/components/account/SignupSettings.vue b/packages/nc-gui/components/account/SignupSettings.vue
index 9b9da1b20f..1281b5902e 100644
--- a/packages/nc-gui/components/account/SignupSettings.vue
+++ b/packages/nc-gui/components/account/SignupSettings.vue
@@ -30,6 +30,7 @@ loadSettings()
 </script>
 
 <template>
+<<<<<<< HEAD
 <<<<<<< HEAD
   <div data-testid="nc-app-settings">
     <div class="text-xl mt-4 mb-8 text-center font-weight-bold capitalize">{{ $t('activity.settings') }}</div>
@@ -37,6 +38,10 @@ loadSettings()
 =======
   <div class="p-7">
     <h1 class="text-xl mt-4 mb-5 pl-3.5 font-weight-bold">Settings</h1>
+=======
+  <div class="p-7 flex flex-col items-center">
+    <h1 class="text-xl mt-4 mb-5 pl-3.5 font-bold">Settings</h1>
+>>>>>>> e66bad074 (fix: allignment)
     <div class="flex items-center gap-2">
 >>>>>>> 41d0c7c53 (fix: ui changes)
       <a-form-item>