Skip to content

[Feat] Button secondary stretch 스타일 변경, 롤링 상세 반응형 UI 수정 #98

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

Merged
looseeyeon merged 5 commits into from
Jun 10, 2025
Merged

[Feat] Button secondary stretch 스타일 변경, 롤링 상세 반응형 UI 수정 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
20cffc1
style: 반응형 UI 수정
summerDev96 Jun 9, 2025
0f32d6d
style: 롤링 상세 반응형 수정
summerDev96 Jun 9, 2025
b74687f
Merge branch 'main' into feat/components-sm
summerDev96 Jun 9, 2025
3c208f1
style: 공통 버튼 stretch 스타일 수정
summerDev96 Jun 9, 2025
03025a6
Merge branch 'Chiman2937:main' into feat/components-sm
summerDev96 Jun 10, 2025
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
34 changes: 17 additions & 17 deletions src/components/Button/Button.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,23 +274,23 @@
justify-content: center;
}

/* 2-2. Secondary Stretch (100%×39) - Secondary Small의 너비만 늘린 버전 */
/* 2-2. Secondary Stretch (100%×56) - Secondary Small의 stretch 버전 */
.secondary-stretch {
background-color: var(--color-white);
color: var(--color-purple-600);
border: 1px solid var(--color-purple-600);
width: 100%; /* 너비만 100%로 변경 */
height: 39px; /* Secondary Small과 동일한 높이 유지 */
padding: 7px 16px;
border-radius: 6px;
font-size: var(--font-size-16);
font-weight: var(--font-weight-regular);
width: 100%; /* 너비 100%로 변경 */
height: 56px; /* 높이 56px로 늘림 */
padding: 14px 24px;
border-radius: 12px;
font-size: var(--font-size-18);
font-weight: var(--font-weight-bold);
font-family: var(--font-family-base);
letter-spacing: -0.16px;
line-height: 26px;
letter-spacing: -0.18px;
line-height: 28px;
text-align: center;
cursor: pointer;
transition: background-color 0.2s ease;
transition: background-color 0.5s ease;
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -313,14 +313,14 @@
color: var(--color-white);
border: 1px solid var(--color-gray-300);
width: 100%; /* 너비만 100%로 변경 */
height: 39px; /* Secondary Small과 동일한 높이 유지 */
padding: 7px 16px;
border-radius: 6px;
font-size: var(--font-size-16);
font-weight: var(--font-weight-regular);
height: 56px;
padding: 14px 24px;
border-radius: 12px;
font-size: var(--font-size-18);
font-weight: var(--font-weight-bold);
font-family: var(--font-family-base);
letter-spacing: -0.16px;
line-height: 26px;
letter-spacing: -0.18px;
line-height: 28px;
text-align: center;
cursor: not-allowed;
display: flex;
Expand Down
1 change: 1 addition & 0 deletions src/pages/RollingPaperItemPage/RollingPaperItemPage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useState } from 'react';
import { useParams, useNavigate } from 'react-router-dom';

import { useModal } from '@/hooks/useModal';
import { useMessageItemsList } from '@/hooks/useMessageItemsList';
import { COLOR_STYLES } from '@/constants/colorThemeStyle';
Expand Down
7 changes: 6 additions & 1 deletion src/pages/RollingPaperItemPage/RollingPaperItemPage.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,17 @@
}

&__container {
width: 100%;
width: 45rem;
box-sizing: border-box;
display: flex;
flex-direction: column;
align-items: end;
gap: 11px;
max-width: var(--wrapper-width);

@include desktop {
width: 100%;
}
}

&__grid {
Expand All @@ -30,6 +34,7 @@
gap: 16px;
max-width: 100%;
justify-items: center;
margin: 0 auto;

@include tablet {
grid-template-columns: repeat(2, 1fr);
Expand Down
2 changes: 1 addition & 1 deletion src/pages/RollingPaperItemPage/components/ListButtonGroup.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const ListButtonGroup = ({ showDelete, onClickEdit, onClickPrev, onClickGoList }
return (
<>
<div className={styles['list__button-group']}>
<Button size={buttonSize} onClick={onClickGoList}>
<Button size={buttonSize} variant={'secondary'} onClick={onClickGoList}>
목록으로
</Button>
{!showDelete && (
Expand Down
Loading