Skip to content

12/26 오후 8시 배포 #267

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
cccwon2 merged 5 commits into from
Dec 26, 2024
Merged

12/26 오후 8시 배포 #267

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
74bb9f3
fix: 마이페이지 스크랩 필터 바 디자인 수정
hongggyelim Dec 26, 2024
22b8efa
fix: 테두리 두께 통일
hongggyelim Dec 26, 2024
92b8ee4
fix: 여백 통일
hongggyelim Dec 26, 2024
294a76e
fix: 테두리 통일
hongggyelim Dec 26, 2024
1460b65
Merge pull request #266 from FE9-2/chore/design-fix
yyezzzyy Dec 26, 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
4 changes: 2 additions & 2 deletions src/app/(pages)/mypage/components/sections/ScrapsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ export default function ScrapsSection() {
return (
<div className="space-y-4">
{/* 필터 드롭다운 섹션 */}
<div className="w-full border-b border-line-200 shadow-md">
<div className="mx-auto flex max-w-screen-xl items-center justify-between gap-2 py-4">
<div className="w-full border-b border-line-100">
<div className="mx-auto flex max-w-screen-xl items-center justify-between gap-2 px-6 py-4">
<div className="flex items-center gap-2">
<FilterDropdown
options={filterPublicOptions.map((option) => option.label)}
Expand Down
2 changes: 1 addition & 1 deletion src/app/(pages)/work-talk/[talkId]/edit/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default function EditTalk({ params }: { params: { talkId: string } }) {
render={({ field }) => (
<textarea
{...field}
className="h-[240px] w-full resize-none rounded-lg bg-background-200 p-[14px] text-[16px] placeholder:text-grayscale-400 focus:outline-none focus:ring-2 focus:ring-primary-orange-300 md:text-[18px] lg:text-[20px]"
className="h-[240px] w-full resize-none rounded-lg bg-background-200 p-[14px] text-[16px] placeholder:text-grayscale-400 focus:border-[0.5px] focus:border-primary-orange-300 focus:outline-none md:text-[18px] lg:text-[20px]"
placeholder="내용을 입력하세요"
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/app/(pages)/work-talk/add/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default function AddTalk() {
render={({ field }) => (
<textarea
{...field}
className="h-[240px] w-full resize-none rounded-lg bg-background-200 p-[14px] text-[16px] placeholder:text-grayscale-400 focus:outline-none focus:ring-2 focus:ring-primary-orange-300 md:text-[18px] lg:text-[20px]"
className="h-[240px] w-full resize-none rounded-lg bg-background-200 p-[14px] text-[16px] placeholder:text-grayscale-400 focus:border-[0.5px] focus:border-primary-orange-300 focus:outline-none md:text-[18px] lg:text-[20px]"
placeholder="내용을 입력하세요"
/>
)}
Expand Down
Loading