Merge pull request #314 from New-Barams/feat/#311/login-page

[노철] - 로그인 페이지 마진 변경
New-Barams · Dec 22, 2023 · b007d58 · b007d58
2 parents 56af757 + ea1fe40
commit b007d58
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 26 deletions.
diff --git a/src/app/(header)/plans/[planId]/index.scss b/src/app/(header)/plans/[planId]/index.scss
@@ -60,22 +60,12 @@
 .plan__header--buttons {
   position: relative;
   display: flex;
-  gap: 1rem;
+  gap: 0.5rem;
   a {
     text-decoration: none;
     color: var(--origin-text-100);
   }
   span {
     cursor: pointer;
   }
-
-  &::after {
-    position: absolute;
-    content: '';
-    display: block;
-    height: 100%;
-    width: 1px;
-    background-color: black;
-    left: 50%;
-  }
 }
diff --git a/src/app/(header)/plans/[planId]/page.tsx b/src/app/(header)/plans/[planId]/page.tsx
@@ -60,7 +60,7 @@ export default function PlanIdPage({ params }: { params: { planId: string } }) {
           <ReadOnlyPlan isMine={isMyPlan} planData={{ ...plan, iconNumber: 1 }}>
             {isMyPlan && isSeason && (
               <div className="plan__header--buttons">
-                <Link href={`/plans/edit/${planId}`}>수정</Link>
+                <Link href={`/plans/edit/${planId}`}>수정</Link>|
                 <span onClick={handleOpenDeleteModal}>삭제</span>
               </div>
             )}
@@ -94,15 +94,14 @@ export default function PlanIdPage({ params }: { params: { planId: string } }) {
                   리마인드 보기
                 </Button>
               </Link>
-              <Link href={`/feedback/${planId}`}>
-                <Button
-                  background="primary"
-                  color="white-100"
-                  size="lg"
-                  border={false}>
-                  피드백 보기
-                </Button>
-              </Link>
+
+              <Button
+                background="primary"
+                color="white-100"
+                size="lg"
+                border={false}>
+                피드백 보기
+              </Button>
             </div>
           </div>
         )}

diff --git a/src/app/(header)/plans/edit/[planId]/page.tsx b/src/app/(header)/plans/edit/[planId]/page.tsx
@@ -75,7 +75,7 @@ export default function EditPage({ params }: { params: { planId: string } }) {
             classNameList={['create-plan-content__plan--title']}
             editable={true}
             kind="title"
-            placeholder=""
+            placeholder="어떤 계획을 가지고 계신가요?"
             onChangeInput={handleChangeTitle}
             maxLength={20}
             textInput={planContent.title}
@@ -86,7 +86,7 @@ export default function EditPage({ params }: { params: { planId: string } }) {
             classNameList={['create-plan-content__plan--description']}
             editable={true}
             kind="content"
-            placeholder=""
+            placeholder="계획에 대해서 자세히 설명해주세요!"
             onChangeInput={handleChangeDescription}
             maxLength={250}
             textInput={planContent.description}
@@ -151,7 +151,7 @@ export default function EditPage({ params }: { params: { planId: string } }) {
           color="white-100"
           background="primary"
           onClick={handleEditPlan}
-          border>
+          border={false}>
           수정완료
         </Button>
         <Link href={`/plans/${planId}`}>

diff --git a/src/app/(headerless)/login/index.scss b/src/app/(headerless)/login/index.scss
@@ -2,7 +2,7 @@
   width: 100%;
   height: 100%;
   overflow-y: scroll;
-  padding: 4rem 0 2rem 0;
+  padding: 2rem 0;
 
   .login {
     display: flex;

diff --git a/src/components/ReadOnlyPlan/ReadOnlyPlan.tsx b/src/components/ReadOnlyPlan/ReadOnlyPlan.tsx
@@ -64,7 +64,7 @@ export default function ReadOnlyPlan({
         <PlanInput
           classNameList={['color-origin-text-100']}
           kind="content"
-          placeholder=""
+          placeholder="어떤 계획을 가지고 계신가요?"
           onChangeInput={() => {}}
           textInput={description}
           maxLength={400}