Skip to content

Commit 48e727e

Browse files
authored
Merge pull request #33 from prgrms-web-devcourse-final-project/feat/button#32
docs/shared 폴더 생성
2 parents 4af25fa + 1e132e1 commit 48e727e

39 files changed

+36
-3
lines changed

src/app/design-system/page.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import Button from '@/shared/components/Button';
2+
13
function Page() {
24
return (
35
<div className="p-6 space-y-6">
@@ -33,7 +35,11 @@ function Page() {
3335

3436
<div className="space-y-2">
3537
<h3 className="text-xl font-medium border-b pb-1">Button</h3>
36-
{/* 여기 컴포넌트 삽입 */}
38+
<Button>버튼</Button>
39+
<Button variant="purple" size="sm">
40+
Button
41+
</Button>
42+
<Button variant="disable">button</Button>
3743
</div>
3844
</div>
3945

src/app/layout.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import type { Metadata } from 'next';
2-
import '../styles/global.css';
3-
2+
import '@/shared/styles/global.css';
43
export const metadata: Metadata = {
54
title: 'SSOUL',
65
description: '칵테일을 좋아하는 사람들을 위한 서비스',
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)