Merge pull request #177 from themoment-team/develop

v 1.3.4
themoment-team · Oct 16, 2022 · 831fda5 · 831fda5 · vercel · Oct 16, 2022
2 parents 7bfa271 + ed652f5
commit 831fda5
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 24 deletions.
diff --git a/packages/hello-gsm/src/PageContainer/ManualPage/index.tsx b/packages/hello-gsm/src/PageContainer/ManualPage/index.tsx
@@ -2,6 +2,7 @@ import { Header } from 'components';
 import type { NextPage } from 'next';
 import * as S from 'PageContainer/InformationPage/style';
 import * as DS from 'components/InformationDescription/style';
+import * as I from 'Assets/svg';
 import styled from '@emotion/styled';
 import { css } from '@emotion/react';
 
@@ -27,6 +28,28 @@ const ManualPageStyle = styled.div`
   }
 `;
 
+const KakaoAccountButton = styled.button`
+  display: flex;
+  align-items: center;
+  width: 328px;
+  height: 45px;
+  background: #fee500;
+  border-radius: 10px;
+  cursor: pointer;
+  color: #0f0921;
+  font-size: 20px;
+  border: none;
+  p {
+    text-align: center;
+    line-height: 45px;
+  }
+  svg {
+    width: 25px;
+    height: 45px;
+    margin: 0 40px 0 20px;
+  }
+`;
+
 const ManualPage: NextPage = () => {
   const location = () =>
     window.open('https://accounts.kakao.com/weblogin/account');
@@ -47,16 +70,18 @@ const ManualPage: NextPage = () => {
               text-align: center;
             `}
           >
-            한 PC에서 여러 계정으로 로그인 하기 위해서는{' '}
-            <DS.Highlight>아래의 이동 버튼</DS.Highlight>을 클릭하여 <br />
-            <DS.Highlight>카카오 계정 홈페이지</DS.Highlight>로{' '}
-            <DS.Highlight>이동 후 로그아웃 한 후</DS.Highlight>에
+            다른 계정으로 로그인이 필요하신 지원자 분들은 아래의
+            <br />
+            <DS.Highlight>카카오계정 홈페이지</DS.Highlight>에서{' '}
+            <DS.Highlight>로그아웃 후</DS.Highlight>
             <br />
-            다시 <DS.Highlight>Hello,GSM</DS.Highlight> 에서{' '}
+            <DS.Highlight>Hello,GSM</DS.Highlight> 에서 다른 계정으로{' '}
             <DS.Highlight>로그인</DS.Highlight> 부탁드립니다.
           </DS.DescriptionText>
         </DS.Description>
-        <S.NextController onClick={location}>이동</S.NextController>
+        <KakaoAccountButton onClick={location}>
+          <I.KakaoLogo /> <p>카카오계정 홈페이지</p>
+        </KakaoAccountButton>
       </S.InformationContent>
       <S.YellowBall />
       <S.BlueBall />

diff --git a/packages/hello-gsm/src/PageContainer/MypagePage/index.tsx b/packages/hello-gsm/src/PageContainer/MypagePage/index.tsx
@@ -202,8 +202,7 @@ const MyPage: NextPage<StatusType> = ({
       <S.Content
         css={css`
           ${isPC && saved && !submitted && 'height: 440px'}
-          ${isPC && !saved && 'height: 320px'}
-          ${isPC && !acceptable && 'height: 320px'}
+          ${isPC && (!saved || !acceptable) && 'height: 320px'}
         `}
       >
         <S.UserBox>

diff --git a/packages/hello-gsm/src/PageContainer/SignInPage/index.tsx b/packages/hello-gsm/src/PageContainer/SignInPage/index.tsx
@@ -14,7 +14,7 @@ const SignInPage: NextPage = () => {
         <S.SignInForm>
           <S.Title>로그인</S.Title>
           <S.SignInBtn href={auth.signin()}>
-            <I.KakaoLogo /> <p>KaKao 로그인</p>
+            <I.KakaoLogo /> <p>카카오계정으로 로그인</p>
           </S.SignInBtn>
         </S.SignInForm>
       </S.SignInPage>

diff --git a/packages/hello-gsm/src/PageContainer/SignInPage/style.ts b/packages/hello-gsm/src/PageContainer/SignInPage/style.ts
@@ -46,7 +46,7 @@ export const SignInBtn = styled.a`
   svg {
     width: 25px;
     height: 45px;
-    margin: 0 60px 0 20px;
+    margin: 0 40px 0 20px;
   }
 `;
 

diff --git a/packages/hello-gsm/src/components/BubbleButton/style.ts b/packages/hello-gsm/src/components/BubbleButton/style.ts
@@ -55,19 +55,6 @@ export const ToCalculator = styled.button`
   }
 
   @media ${device.mobile} {
-    position: static;
-    font-size: 14px;
-    width: 240px;
-    height: 40px;
-    &:nth-of-type(1) {
-      line-height: 20px;
-      padding: 0 20px;
-    }
-    &:nth-of-type(2) {
-      line-height: 20px;
-    }
-    :after {
-      display: none;
-    }
+    display: none;
   }
 `;