From 6f81414c52278e5eac7291609f36b6c7cb310316 Mon Sep 17 00:00:00 2001
From: Jayjunyoung <no2jfamily@tukorea.ac.kr>
Date: Wed, 22 May 2024 18:54:42 +0900
Subject: [PATCH] =?UTF-8?q?design:=20ContactSection=20=EC=9D=B4=EB=A6=84?=
 =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=20=EA=B3=B5=EB=B0=B1=EC=8B=9C=20css=20?=
 =?UTF-8?q?=EB=94=94=EC=9E=90=EC=9D=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainSection/ContactSection.tsx            | 17 +------
 .../_components/mainSection/IntroSection.tsx  | 44 -------------------
 2 files changed, 1 insertion(+), 60 deletions(-)

diff --git a/gitlio/app/editor/_components/mainSection/ContactSection.tsx b/gitlio/app/editor/_components/mainSection/ContactSection.tsx
index 7b4f2c1..dae37f1 100644
--- a/gitlio/app/editor/_components/mainSection/ContactSection.tsx
+++ b/gitlio/app/editor/_components/mainSection/ContactSection.tsx
@@ -19,7 +19,6 @@ export default function ContactSection() {
     <div className="bg-white w-[800px] flex flex-col flex-1 justify-start rounded-xl pb-5">
       <h1 className="text-3xl font-semibold ml-10 mr-5 pt-5">#Contact</h1>
       <div className="flex flex-col items-center h-full w-full mt-5">
-<<<<<<< HEAD
         <div
           className={`flex ${contact.option === 'option1' ? 'flex-col items-center' : 'flex-row justify-start items-center'} w-fit mx-10 px-6 bg-neutral-content/30 rounded-3xl shadow-md`}
         >
@@ -31,7 +30,7 @@ export default function ContactSection() {
             </div>
           ) : (
             <div
-              className={`font-bold text-zinc-300 mt-6 text-xl ${contact.option === 'option1' ? 'mt-6' : 'mr-6 mt-0'}`}
+              className={`font-bold text-zinc-300 text-xl ${contact.option === 'option1' ? 'mt-6' : 'mr-6 mt-0'}`}
             >
               insert your name
             </div>
@@ -39,17 +38,6 @@ export default function ContactSection() {
           <div
             className={`flex flex-wrap w-full justify-center items-center mt-6 ${contact.option === 'option1' ? '' : 'flex-1'}`}
           >
-=======
-        <div className="flex flex-col items-center w-fit mx-10 px-6 bg-neutral-content/30 rounded-3xl shadow-md">
-          {contactInfo.name ? (
-            <div className="text-lg font-semibold mt-6">{contactInfo.name}</div>
-          ) : (
-            <div className="font-bold text-zinc-300 mt-6 text-xl">
-              insert your name
-            </div>
-          )}
-          <div className="flex flex-wrap w-full justify-start justify-center items-center mt-6">
->>>>>>> develop
             <div className="flex w-[295px] justify-start items-center mb-6">
               <MdEmail className="text-xl mr-2" />
               <div className="flex justify-start items-center break-all text-sm max-w-[267px]">
@@ -71,7 +59,6 @@ export default function ContactSection() {
                   ''
                 )}
                 <div className="flex justify-start items-center break-all text-sm max-w-[267px]">
-<<<<<<< HEAD
                   {blog.url ? blog.url : ''}
                 </div>
               </div>
@@ -91,8 +78,6 @@ export default function ContactSection() {
                   ''
                 )}
                 <div className="flex justify-start items-center break-all text-sm max-w-[267px]">
-=======
->>>>>>> develop
                   {blog.url ? blog.url : ''}
                 </div>
               </div>
diff --git a/gitlio/app/editor/_components/mainSection/IntroSection.tsx b/gitlio/app/editor/_components/mainSection/IntroSection.tsx
index 4dcfdff..8f8534e 100644
--- a/gitlio/app/editor/_components/mainSection/IntroSection.tsx
+++ b/gitlio/app/editor/_components/mainSection/IntroSection.tsx
@@ -19,7 +19,6 @@ export default function IntroSection() {
   }, [profile.introDescription]);
 
   return (
-<<<<<<< HEAD
     <div className="flex flex-col w-[800px] bg-white mt-10 rounded-3xl p-10">
       <h1 className="text-3xl font-semibold mr-5">#Introduction</h1>
       {intro.option === 'option3' ? (
@@ -115,49 +114,6 @@ export default function IntroSection() {
           </div>
         </div>
       )}
-=======
-    <div className="flex flex-col w-[800px] justify-between bg-white mt-10 rounded-3xl p-10">
-      <h1 className="text-3xl font-semibold mr-5">#Introduction</h1>
-      <div className="flex flex-col">
-        <div className="flex flex-row">
-          <div className="flex flex-col items-start h-full mr-15">
-            <div className="w-[160px] h-[160px] my-6 mx-6 bg-cover bg-center rounded-full flex items-center justify-center">
-              {profile.profileImage ? (
-                <img
-                  className="w-full h-full rounded-full text-center object-cover"
-                  src={profile.profileImage}
-                  alt="Profile"
-                />
-              ) : (
-                <div className="w-full h-full rounded-full text-center flex items-center justify-center bg-gray-300">
-                  <span className="text-gray-500">Profile</span>
-                </div>
-              )}
-            </div>
-          </div>
-          <div className="flex flex-col justify-start w-full py-6 ml-6">
-            {profile.title ? (
-              <div className="flex flex-row w-full justify-start font-bold text-2xl mt-6">
-                {profile.title}
-              </div>
-            ) : (
-              <div className="flex flex-row w-full justify-start font-bold text-zinc-300 text-2xl mt-6">
-                {'insert your title'}
-              </div>
-            )}
-
-            <div className="flex flex-row justify-start w-full mt-5">
-              {profile.tagList?.map((tag, index) => (
-                <IntroTagList key={index} data={tag} />
-              ))}
-            </div>
-          </div>
-        </div>
-        <div className="textarea whitespace-pre-wrap flex min-h-[80px] px-4 w-9/10 justify-center mx-6 text-center items-center justify-center text-white border rounded-2xl bg-[#374151] overflow-y-auto">
-          {profile.introDescription}
-        </div>
-      </div>
->>>>>>> develop
     </div>
   );
 }