Skip to content
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

Jump to bottom

⚙️ 프로젝트 추가 설정 #5

Merged
merged 17 commits into from
Oct 13, 2024
Merged

⚙️ 프로젝트 추가 설정 #5

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d536214
feat: zustand version 4.5.5 재설치
Oct 9, 2024
4a49def
feat: font 파일 추가
Oct 9, 2024
8367e66
feat: logo.svg 추가
Oct 9, 2024
bd54ffa
feat: network_error.png 추가
Oct 9, 2024
80a9eb3
feat: 기존 file 삭제
Oct 9, 2024
a551764
feat: font 설정 완료
Oct 9, 2024
23ba1d6
feat: eslint 추가 설정
Oct 9, 2024
74f4176
feat: tanstack/react-query devtool setting
Legitgoons Oct 9, 2024
d8f8944
feat: QueryProvider setting
Legitgoons Oct 9, 2024
047798e
feat: font-family update
Legitgoons Oct 12, 2024
ed3d3c0
fix: eslint unused setting remove
Legitgoons Oct 12, 2024
3b9c88c
feat: tailwind css createFontSize 함수 구현
Legitgoons Oct 12, 2024
5560c0d
fix: eslint.config.mjs remove
Legitgoons Oct 12, 2024
b3a3064
feat: eslint import update
Legitgoons Oct 12, 2024
4e931c8
Merge branch 'main' into feat/project-setting-2
Legitgoons Oct 12, 2024
8817262
feat: delete fsd-import
Legitgoons Oct 13, 2024
453e8e4
feat: tailwind.config.ts update
Legitgoons Oct 13, 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
39 changes: 24 additions & 15 deletions tailwind.config.ts
View file
Open in desktop
Legitgoons marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
import type { Config } from 'tailwindcss';

const createFontSize = (
Legitgoons marked this conversation as resolved.
Show resolved Hide resolved
size: string,
fontWeight: string,
lineHeight: string = '130%',
): [string, { letterSpacing: string; lineHeight: string; fontWeight: string | number }] => [
size,
{ letterSpacing: '-0.03em', lineHeight, fontWeight },
];

const config: Config = {
content: [
'./app/**/*.{js,ts,jsx,tsx,mdx}',
Expand All @@ -17,21 +26,21 @@ const config: Config = {
sans: ['Pretendard', 'sans-serif'],
},
fontSize: {
h1b: ['24px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: 'bold' }],
h1s: ['24px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '600' }],
h2s: ['20px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '600' }],
h3b: ['16px', { letterSpacing: '-0.03em', lineHeight: '140%', fontWeight: 'bold' }],
h3s: ['16px', { letterSpacing: '-0.03em', lineHeight: '140%', fontWeight: '600' }],
h4s: ['14px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '600' }],
h4m: ['14px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '500' }],
b1s: ['12px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '600' }],
b1m: ['12px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '500' }],
b1r: ['12px', { letterSpacing: '-0.03em', lineHeight: '140%', fontWeight: '400' }],
b2s: ['11px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '600' }],
b2m: ['11px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '500' }],
b2r: ['11px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '400' }],
b3m: ['9px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '500' }],
b4m: ['8px', { letterSpacing: '-0.03em', lineHeight: '130%', fontWeight: '500' }],
h1b: createFontSize('24px', 'bold'),
h1s: createFontSize('24px', '600'),
h2s: createFontSize('20px', '600'),
h3b: createFontSize('16px', 'bold', '140%'),
h3s: createFontSize('16px', '600', '140%'),
h4s: createFontSize('14px', '600'),
h4m: createFontSize('14px', '500'),
b1s: createFontSize('12px', '600'),
b1m: createFontSize('12px', '500'),
b1r: createFontSize('12px', '400', '140%'),
b2s: createFontSize('11px', '600'),
b2m: createFontSize('11px', '500'),
b2r: createFontSize('11px', '400'),
b3m: createFontSize('9px', '500'),
b4m: createFontSize('8px', '500'),
},
},
},
Expand Down