From 21bb8d87a988a6dd047512d8e9762cd51ec3d5bd Mon Sep 17 00:00:00 2001 From: choisohyun Date: Wed, 27 Jul 2022 22:49:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?style:=20=EB=86=92=EC=9D=B4=EA=B0=80=20?= =?UTF-8?q?=EB=82=AE=EC=9D=80=20=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C?= =?UTF-8?q?=EC=9D=98=20=EC=84=A4=EB=AC=B8=20UI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/MultiRangeSlider.tsx | 1 + src/components/base/SimpleRangeSlider.tsx | 1 + src/components/domain/survey/SurveyTemplate.tsx | 10 +++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/base/MultiRangeSlider.tsx b/src/components/base/MultiRangeSlider.tsx index fe4db1c..4d2815e 100644 --- a/src/components/base/MultiRangeSlider.tsx +++ b/src/components/base/MultiRangeSlider.tsx @@ -103,6 +103,7 @@ const MultiRangeSlider = ({ initValue, min, max, onChange }: MultiRangeSliderPro }; const Container = styled.div` + position: relative; height: 50px; display: flex; align-items: center; diff --git a/src/components/base/SimpleRangeSlider.tsx b/src/components/base/SimpleRangeSlider.tsx index 9e2c2bb..e509801 100644 --- a/src/components/base/SimpleRangeSlider.tsx +++ b/src/components/base/SimpleRangeSlider.tsx @@ -88,6 +88,7 @@ const SimpleRangeSlider = ({ min, max, initValue, isStep5 = false, onChange }: S }; const Container = styled.div` + position: relative; height: 50px; display: flex; align-items: center; diff --git a/src/components/domain/survey/SurveyTemplate.tsx b/src/components/domain/survey/SurveyTemplate.tsx index bd7b29c..6129855 100644 --- a/src/components/domain/survey/SurveyTemplate.tsx +++ b/src/components/domain/survey/SurveyTemplate.tsx @@ -3,6 +3,7 @@ import { Link } from 'react-router-dom'; import React, { MouseEventHandler, ReactNode } from 'react'; import { Button } from '@/components/base'; import ProgressBar, { ProgressBarProps } from '@/components/base/ProgressBar'; +import { palette } from '@/lib/styles/palette'; interface SurveyTemplateProps extends Partial { children: ReactNode; @@ -28,7 +29,7 @@ const SurveyTemplate = ({ 외딴썸 - {children} + {children} {hasProgressBar && } {!disabledFooter && ( @@ -73,10 +74,17 @@ export const Logo = styled(Link)` color: rgba(0, 0, 0, 0.8); `; +const ContentsWrapper = styled.div` + overflow: scroll; + height: calc(100% - 56px - 117px - 38px - 20px); +`; + const NavigationWrapper = styled.div` + background-color: ${palette.backgroundColor}; position: absolute; width: 100%; bottom: 38px; + z-index: 1000; `; const ButtonWrapper = styled.div` From 2bc73c777457a2d4eadba55e3d46adbdb0f5b0ec Mon Sep 17 00:00:00 2001 From: choisohyun Date: Thu, 28 Jul 2022 20:56:05 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=ED=95=99=EA=B5=90=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D=20FormWrapper=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/AuthMail.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/AuthMail.tsx b/src/pages/AuthMail.tsx index 5a20156..5d82370 100644 --- a/src/pages/AuthMail.tsx +++ b/src/pages/AuthMail.tsx @@ -81,10 +81,8 @@ export const StyledButton = styled(Button)` `; export const FormWrapper = styled.div` - position: absolute; width: 100%; top: 40%; - transform: translateY(-50%); margin-top: 65px; `;