Skip to content

Commit

Permalink
Merge branch 'main' into feature/15-naver-map-test
Browse files Browse the repository at this point in the history
  • Loading branch information
karnelll authored Oct 14, 2024
2 parents a470f89 + 148682c commit ff82093
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 21 deletions.
1 change: 1 addition & 0 deletions fe/postcss.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
const config = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ export default function NaverLoginButton() {
};

return (
<button type="button" onClick={handleLogin}>
<button
type="button"
onClick={handleLogin}
className="bg-green-500 text-white p-4 rounded-lg"
>
Sign in with Naver
</button>
);
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion fe/src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ body {
padding: 0;
width: 360px;
height: 100vh;
margin: 0px auto;
margin: 0 auto;
}
79 changes: 60 additions & 19 deletions fe/tailwind.config.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,70 @@
import type { Config } from "tailwindcss";
import type { Config } from 'tailwindcss';

const config: Config = {
darkMode: 'class', // ๋‹คํฌ ๋ชจ๋“œ ์„ค์ • (ํ•„์š” ์‹œ ํ™œ์„ฑํ™” ๊ฐ€๋Šฅ)
content: [
"./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
"./src/components/**/*.{js,ts,jsx,tsx,mdx}",
"./src/app/**/*.{js,ts,jsx,tsx,mdx}",
'./src/pages/**/*.{js,ts,jsx,tsx,mdx}',
'./src/components/**/*.{js,ts,jsx,tsx,mdx}',
'./src/app/**/*.{js,ts,jsx,tsx,mdx}',
],
theme: {
extend: {
// ์ปฌ๋Ÿฌ ํŒ”๋ ˆํŠธ ์„ค์ •
colors: {
background: "var(--background)",
foreground: "var(--foreground)",
// Gray ํŒ”๋ ˆํŠธ (์›น ์ ‘๊ทผ์„ฑ ๋Œ€๋น„์œจ ์ค€์ˆ˜)
gray: {
50: '#F8F8F8',
100: '#F5F5F5',
200: '#E8E8E8',
300: '#D1D1D1',
400: '#BFBFBF',
500: '#A6A6A6',
600: '#777777',
700: '#444444',
800: '#333333',
900: '#222527',
},

// Semantic Colors (ํ…์ŠคํŠธ, ์•„์ด์ฝ˜, ๊ฒฝ๊ณ„์„  ๋“ฑ)
text: {
default: '#222527', // ๊ธฐ๋ณธ ํ…์ŠคํŠธ
subdued: '#444444', // ๋ณด์กฐ ํ…์ŠคํŠธ
info: '#777777', // ์ •๋ณด ํ…์ŠคํŠธ
disabled: '#A6A6A6', // ๋น„ํ™œ์„ฑํ™” ํ…์ŠคํŠธ
heading: '#222527', // ํƒ€์ดํ‹€ ํ…์ŠคํŠธ
},

icon: {
default: '#444444', // ๊ธฐ๋ณธ ์•„์ด์ฝ˜ ์ƒ‰์ƒ
sub: '#777777', // ๋ณด์กฐ ์•„์ด์ฝ˜ ์ƒ‰์ƒ
disabled: '#BFBFBF', // ๋น„ํ™œ์„ฑํ™” ์•„์ด์ฝ˜ ์ƒ‰์ƒ
},

border: {
default: '#BFBFBF', // ๊ธฐ๋ณธ ๊ฒฝ๊ณ„์„  ์ƒ‰์ƒ
strong: '#A6A6A6', // ๊ฐ•์กฐ๋œ ๊ฒฝ๊ณ„์„  ์ƒ‰์ƒ
disabled: '#E8E8E8', // ๋น„ํ™œ์„ฑํ™”๋œ ๊ฒฝ๊ณ„์„  ์ƒ‰์ƒ
},

divider: {
default: '#E8E8E8', // ๊ธฐ๋ณธ ๊ตฌ๋ถ„์„  ์ƒ‰์ƒ
strong: '#A6A6A6', // ๊ฐ•์กฐ๋œ ๊ตฌ๋ถ„์„  ์ƒ‰์ƒ
},

background: {
light: '#F8F8F8', // ๋ฐ์€ ๋ฐฐ๊ฒฝ์ƒ‰
deep: '#F5F5F5', // ์ง„ํ•œ ๋ฐฐ๊ฒฝ์ƒ‰
},

// ๊ธฐ์กด Primary, Secondary, Grayscale ๋“ฑ ์ปฌ๋Ÿฌ ํŒ”๋ ˆํŠธ
primary: {
0: "#FFF7F7",
5: "#FEEBEA",
10: "#FCD0D5",
20: "#FCB0AB",
30: "#FA8980",
40: "#F96156",
50: "#F73A2C", // normal
60: "#CF2F24", // pressed
50: "#F73A2C", // ๊ธฐ๋ณธ ์ƒํƒœ
60: "#CF2F24", // ๋ˆŒ๋ฆฐ ์ƒํƒœ
70: "#A62518",
80: "#7E1A13",
90: "#55100A",
Expand All @@ -34,8 +77,8 @@ const config: Config = {
20: "#B0D3F7",
30: "#98BDF2",
40: "#61A7EE",
50: "#3A91EA", // normal
60: "#2F79C4", // pressed
50: "#3A91EA", // ๊ธฐ๋ณธ ์ƒํƒœ
60: "#2F79C4", // ๋ˆŒ๋ฆฐ ์ƒํƒœ
70: "#26509E",
80: "#1A4877",
90: "#102F51",
Expand All @@ -45,7 +88,7 @@ const config: Config = {
0: "#FFFFFF",
5: "#F8F8F8",
10: "#F0F0F0",
20: "#E4E4E4", // disabled
20: "#E4E4E4", // ๋น„ํ™œ์„ฑํ™”
30: "#D8D8D8",
40: "#C8C8C8",
50: "#B8B8B8",
Expand All @@ -58,24 +101,24 @@ const config: Config = {
danger: {
surface: "#FFF7F7",
border: "#FCD0D5",
base: "#F73A2C", // normal
base: "#F73A2C", // ๊ธฐ๋ณธ ์ƒํƒœ
text: "#2D0502",
},
success: {
surface: "#F7FBFE",
border: "#D8E9FB",
base: "#3A91EA", // normal
base: "#3A91EA", // ๊ธฐ๋ณธ ์ƒํƒœ
text: "#05172B",
},
warning: {
surface: "#FFFCF7",
border: "#FFEDC3",
base: "#FFC35F", // normal
base: "#FFC35F", // ๊ธฐ๋ณธ ์ƒํƒœ
text: "#3F2C00",
},
},

// ํฐํŠธ ์Šคํƒ€์ผ ์„ค์ •
// ํฐํŠธ ์„ค์ •
fontSize: {
"title-xlg": ["28px", { lineHeight: "150%" }],
"title-lg": ["24px", { lineHeight: "150%" }],
Expand All @@ -87,14 +130,12 @@ const config: Config = {
caption: ["12px", { lineHeight: "150%" }],
},

// ํฐํŠธ ์›จ์ดํŠธ ์„ค์ • (๋ฌธ์ž์—ด๋กœ ์ˆ˜์ •)
fontWeight: {
100: "100",
200: "200",
300: "300",
},

// Pretendard ํฐํŠธ ์ถ”๊ฐ€
fontFamily: {
pretendard: ["Pretendard", "sans-serif"],
},
Expand All @@ -114,4 +155,4 @@ const config: Config = {
plugins: [],
};

export default config;
export default config;

0 comments on commit ff82093

Please sign in to comment.