Merge branch 'Develop' into Weekly

kakao-tech-campus-2nd-step3 · Nov 15, 2024 · 7bbce8a · 7bbce8a
2 parents b36f68c + 8128aa8
commit 7bbce8a
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/features/myPage/employee/components/EmployeeProfile.tsx b/src/features/myPage/employee/components/EmployeeProfile.tsx
@@ -50,4 +50,4 @@ const TextSection = styled.div`
   flex-direction: column;
   justify-content: start;
   margin-left: 20px;
-`;
+`;
diff --git a/src/features/myPage/employee/components/MyRecruitCard.tsx b/src/features/myPage/employee/components/MyRecruitCard.tsx
@@ -109,4 +109,4 @@ const TextSection = styled.div`
   justify-content: space-between;
   flex: 1;
   padding: 0 10px;
-`;
+`;
diff --git a/src/pages/contract/EmployeeContract/EmployeeContract.tsx b/src/pages/contract/EmployeeContract/EmployeeContract.tsx
@@ -43,4 +43,4 @@ const LineWrapper = styled.div`
   box-shadow:
     rgba(50, 50, 93, 0.25) 0px 6px 12px -2px,
     rgba(0, 0, 0, 0.3) 0px 3px 7px -3px;
-`;
+`;
diff --git a/src/pages/contract/EmployerContract/EmployerContract.tsx b/src/pages/contract/EmployerContract/EmployerContract.tsx
@@ -32,4 +32,4 @@ const LineWrapper = styled.div`
   box-shadow:
     rgba(50, 50, 93, 0.25) 0px 6px 12px -2px,
     rgba(0, 0, 0, 0.3) 0px 3px 7px -3px;
-`;
+`;
diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx
@@ -29,4 +29,4 @@ export default function Home() {
       </section>
     </Layout>
   );
-}
+}
diff --git a/src/pages/myPage/employee/EmployeeMyPage.tsx b/src/pages/myPage/employee/EmployeeMyPage.tsx
@@ -45,4 +45,4 @@ const spinnerFlexStyle = css`
   bottom: 0;
   left: 0;
   right: 0;
-`;
+`;
diff --git a/src/pages/myPage/employer/EmPloyerMyPage.tsx b/src/pages/myPage/employer/EmPloyerMyPage.tsx
@@ -83,4 +83,4 @@ export default function EmployerMyPage() {
       </div>
     </Layout>
   );
-}
+}
diff --git a/src/pages/postNotice/PostNotice.tsx b/src/pages/postNotice/PostNotice.tsx
@@ -33,4 +33,4 @@ const LineWrapper = styled.div`
   box-shadow:
     rgba(50, 50, 93, 0.25) 0px 6px 12px -2px,
     rgba(0, 0, 0, 0.3) 0px 3px 7px -3px;
-`;
+`;
diff --git a/src/pages/registerCompany/RegisterCompany.tsx b/src/pages/registerCompany/RegisterCompany.tsx
@@ -29,4 +29,4 @@ const LineWrapper = styled.div`
   box-shadow:
     rgba(50, 50, 93, 0.25) 0px 6px 12px -2px,
     rgba(0, 0, 0, 0.3) 0px 3px 7px -3px;
-`;
+`;
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,4 +29,4 @@ export default function Home() { @@
           </section>
         </Layout>
       );
-    }
+    }