Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix] 바텀시트 내부 버튼 폭 수정 및 컨텐츠 간격 조정 #235

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+33 −13
Open

[Fix] 바텀시트 내부 버튼 폭 수정 및 컨텐츠 간격 조정 #235

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91d383c
fix: 바텀시트 내부 버튼 폭 조정
yarimu Sep 16, 2024
bbde72b
fix: 공통 컴포넌트(토글) 사이즈 조정
yarimu Sep 16, 2024
ad357f3
fix: 바텀시트 내부 컨텐츠 간격 조정
yarimu Sep 16, 2024
c50e508
fix: 바텀시트 내부 핸들바 중앙정렬
yarimu Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/commons/ToggleButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const Wrapper = styled.div`
const Layout = styled.div`
display: flex;

width: 33.7rem;
width: 100%;
height: 4.4rem;
border-radius: 8px;

Expand Down
26 changes: 17 additions & 9 deletions src/pages/juniorPromise/components/BottomSheetBg.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ export const BottomSheet = (props: BottomSheetPropType) => {
<Title>원하는 선배를 찾아볼까요?</Title>
<Desc>계열, 직무로 원하는 선배를 찾을 수 있어요.</Desc>
</TitleLayout>
<ToggleButton
left="계열"
right="직무"
activeButton={filterActiveBtn}
onSetActiveButtonHandler={handleFilterActiveBtn}
/>
<ToggleLayout>
<ToggleButton
left="계열"
right="직무"
activeButton={filterActiveBtn}
onSetActiveButtonHandler={handleFilterActiveBtn}
/>
</ToggleLayout>

<Content>
{filterActiveBtn === '계열' ? (
<FieldLayout>
Expand Down Expand Up @@ -137,6 +140,10 @@ const TitleLayout = styled.header`
padding: 1.4rem 16.1rem 1.6rem 2rem;
`;

const ToggleLayout = styled.div`
margin: 0 2rem;
`;

const Content = styled.div`
overflow: auto;

Expand All @@ -149,7 +156,7 @@ const FieldLayout = styled.div`
justify-content: space-between;

margin: 0 2rem;
padding: 1rem 0;
padding: 1.5rem 0;
`;

const PositionLayout = styled.div`
Expand All @@ -158,7 +165,7 @@ const PositionLayout = styled.div`
gap: 1.2rem 1rem;
flex-shrink: 0;

margin: 1rem 2rem;
margin: 1.5rem 2rem;
`;

const Line = styled.div`
Expand Down Expand Up @@ -200,7 +207,8 @@ const ReloadIcon = styled.button`
`;

const ExitBottomSheet = styled.button<{ $selectedPositionIndex: boolean; $selectedFieldIndex: boolean }>`
width: 27.4rem;
flex-grow: 1;

height: 5rem;
border-radius: 8px;

Expand Down
Loading