Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bec566d
Merge pull request #160 from FE9-2/dev
cccwon2 Dec 14, 2024
d32604c
Merge pull request #162 from FE9-2/dev
cccwon2 Dec 14, 2024
af60191
Merge pull request #170 from FE9-2/dev
cccwon2 Dec 16, 2024
0fee6ce
Merge pull request #178 from FE9-2/dev
cccwon2 Dec 16, 2024
a70c636
Merge pull request #185 from FE9-2/dev
cccwon2 Dec 17, 2024
c117612
Merge pull request #195 from FE9-2/dev
cccwon2 Dec 18, 2024
1b1500a
Merge pull request #214 from FE9-2/dev
cccwon2 Dec 19, 2024
0d41ee1
Merge pull request #217 from FE9-2/dev
cccwon2 Dec 19, 2024
0e75ab2
Merge pull request #220 from FE9-2/dev
cccwon2 Dec 19, 2024
29d344d
Merge pull request #223 from FE9-2/dev
cccwon2 Dec 19, 2024
b04af34
Merge pull request #238 from FE9-2/dev
cccwon2 Dec 24, 2024
314fc4b
Merge pull request #240 from FE9-2/dev
hongggyelim Dec 24, 2024
1cabffb
Merge pull request #243 from FE9-2/dev
cccwon2 Dec 24, 2024
0163b13
Merge pull request #247 from FE9-2/dev
cccwon2 Dec 24, 2024
bf2086f
Merge pull request #252 from FE9-2/dev
cccwon2 Dec 26, 2024
6914962
Merge pull request #254 from FE9-2/dev
cccwon2 Dec 26, 2024
29db366
Merge pull request #258 from FE9-2/dev
cccwon2 Dec 26, 2024
785c62c
Merge pull request #260 from FE9-2/dev
cccwon2 Dec 26, 2024
dc2f2bd
Merge pull request #262 from FE9-2/dev
cccwon2 Dec 26, 2024
df7e619
Merge pull request #265 from FE9-2/dev
cccwon2 Dec 26, 2024
74bb9f3
fix: 마이페이지 스크랩 필터 바 디자인 수정
hongggyelim Dec 26, 2024
22b8efa
fix: 테두리 두께 통일
hongggyelim Dec 26, 2024
92b8ee4
fix: 여백 통일
hongggyelim Dec 26, 2024
294a76e
fix: 테두리 통일
hongggyelim 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
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
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
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