Merge pull request #272 from modern-agile-team/develop

영상제작 전 마지막 수정
modern-agile-team · Apr 4, 2024 · 201d7a0 · 201d7a0
2 parents fdad50b + e907b97
commit 201d7a0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/src/components/molecules/mentor-review-elements/MentorReviewElements.tsx b/src/components/molecules/mentor-review-elements/MentorReviewElements.tsx
@@ -56,7 +56,7 @@ const MentorReviewElements = (props: ReviewProprType) => {
         </LinkBox>
         <S.ReviewTextBox defaultBg={props.isLocation}>
           <div>{props.createdAt.slice(0, 10)}</div>
-          <div>{props.review}123123</div>
+          <div>{props.review}</div>
         </S.ReviewTextBox>
         <S.ReportBox>
           {props.isLocation ? (

diff --git a/src/components/organisms/create-board/CreateBody.tsx b/src/components/organisms/create-board/CreateBody.tsx
@@ -359,7 +359,9 @@ const CreateBody = () => {
             </div>
           </S.ImageUploadBox>
         </div>
-        <S.SubmitBox onClick={handleSubmit}>올리기</S.SubmitBox>
+        <FlexBox type="flex" col="right">
+          <S.SubmitBox onClick={handleSubmit}>올리기</S.SubmitBox>
+        </FlexBox>
       </S.CreateHelpContainer>
     </S.CreateBoardWrapper>
   );

diff --git a/src/components/organisms/create-board/styled.ts b/src/components/organisms/create-board/styled.ts
@@ -76,9 +76,21 @@ export const ImageUploadBox = styled.div`
   width: 100%;
 `;
 
-export const SubmitBox = styled.div`
+export const SubmitBox = styled.button`
   color: #ff772b;
   cursor: pointer;
+  font-size: 0.83em;
+  font-weight: 400;
+  line-height: 150%;
+  margin: 10px 0px 10vh 0px;
+  border: 2px solid #ff772b;
+  border-radius: 5px;
+  background-color: #fff;
+  transition: background-color 0.3 ease;
+  &:hover {
+    background-color: #ff772b;
+    color: #fff;
+  }
 `;
 
 interface DropType {

diff --git a/src/components/organisms/my-profile/MyProfileConetents.tsx b/src/components/organisms/my-profile/MyProfileConetents.tsx
@@ -1,5 +1,12 @@
 import USER from '@/apis/user';
-import { FlexBox, ImageBox } from '@/components/common/globalStyled/styled';
+import {
+  FlexBox,
+  ImageBox,
+  ToolTipBox,
+  ToolTipContainer,
+  Tooltip,
+  TooltipImage,
+} from '@/components/common/globalStyled/styled';
 import { useEffect, useState } from 'react';
 import * as S from './styled';
 import { MyProfileType, UserProfileType } from '@/types/user';
@@ -25,10 +32,14 @@ const MyProfileContents = () => {
         href={{
           pathname: `/mypage/info/update`,
         }}>
-        <img
-          src="https://menbosha-s3.s3.ap-northeast-2.amazonaws.com/public/mypage/profileSettingBtn.svg"
-          alt="프로필설정"
-        />
+        <ToolTipContainer hoverBox="image">
+          <TooltipImage
+            src="https://menbosha-s3.s3.ap-northeast-2.amazonaws.com/public/mypage/profileSettingBtn.svg"
+            alt="프로필설정"
+          />
+
+          <Tooltip>프로필 수정</Tooltip>
+        </ToolTipContainer>
       </Link>
       <div></div>
       <div>