From df5b59e72b52c9d48b821305bbc7984e2674585f Mon Sep 17 00:00:00 2001 From: Hooni07 Date: Mon, 11 Mar 2024 21:41:43 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Chore:=20=EC=9E=84=EC=8B=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/fontStyle.jsx | 1 + src/styles/reset.js | 82 ---------------------------------------- 2 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 src/styles/reset.js diff --git a/src/styles/fontStyle.jsx b/src/styles/fontStyle.jsx index 00d0564..9e3393a 100644 --- a/src/styles/fontStyle.jsx +++ b/src/styles/fontStyle.jsx @@ -1,4 +1,5 @@ import { css } from 'styled-components'; +// hello export const bold28 = css` font-family: Pretendard; diff --git a/src/styles/reset.js b/src/styles/reset.js deleted file mode 100644 index 3c61a13..0000000 --- a/src/styles/reset.js +++ /dev/null @@ -1,82 +0,0 @@ -import { css } from 'styled-components'; - -const reset = css` - * { - margin: 0; - padding: 0; - box-sizing: border-box; - color: inherit; - word-break: keep-all; - } - - :root { - --z-index-nav: 100; - } - - a { - color: inherit; - text-decoration: none; - cursor: pointer; - } - - button { - border: none; - padding: unset; - background-color: unset; - cursor: pointer; - } - - input { - border: none; - padding: none; - } - - input:focus { - outline: none; - } - - input[type='search']::-webkit-search-decoration, - input[type='search']::-webkit-search-cancel-button, - input[type='search']::-webkit-search-results-button, - input[type='search']::-webkit-search-results-decoration { - display: none; - } - - .align-right { - text-align: right; - } - - .align-center { - text-align: center; - } - - .align-justify { - text-align: justify; - } - - .size-large { - font-size: 1.5em; - } - - .size-small { - font-size: 0.75em; - } - - .noto-sans { - font-family: 'Noto Sans', sans-serif !important; - } - - .pretendard { - font-family: 'Pretendard', sans-serif !important; - } - - .nanum-gothic { - font-family: 'Nanum Gothic', sans-serif !important; - } - - .nanum-myeongjo { - font-family: 'Nanum Myeongjo', serif !important; - } -`; - -export default reset; From 4e606703a329fb1906446eb01968b8bec6095b03 Mon Sep 17 00:00:00 2001 From: Hooni07 Date: Mon, 11 Mar 2024 21:42:03 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Chore:=20=EC=9E=84=EC=8B=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/fontStyle.jsx | 128 --------------------------------------- 1 file changed, 128 deletions(-) delete mode 100644 src/styles/fontStyle.jsx diff --git a/src/styles/fontStyle.jsx b/src/styles/fontStyle.jsx deleted file mode 100644 index 9e3393a..0000000 --- a/src/styles/fontStyle.jsx +++ /dev/null @@ -1,128 +0,0 @@ -import { css } from 'styled-components'; -// hello - -export const bold28 = css` - font-family: Pretendard; - font-size: 2.8rem; - font-style: normal; - font-weight: 700; - line-height: 4.2rem; - letter-spacing: -0.028rem; -`; - -export const bold24 = css` - font-family: Pretendard; - font-size: 2.4rem; - font-style: normal; - font-weight: 700; - line-height: 3.6rem; - letter-spacing: -0.028rem; -`; - -export const regular24 = css` - font-family: Pretendard; - font-size: 2.4rem; - font-style: normal; - font-weight: 400; - line-height: 3.6rem; - letter-spacing: -0.024rem; -`; - -export const bold20 = css` - font-family: Pretendard; - font-size: 2rem; - font-style: normal; - font-weight: 700; - line-height: 3rem; - letter-spacing: -0.02rem; -`; - -export const regular20 = css` - font-family: Pretendard; - font-size: 2rem; - font-style: normal; - font-weight: 400; - line-height: 3rem; - letter-spacing: -0.02rem; -`; - -export const bold18 = css` - font-family: Pretendard; - font-size: 1.8rem; - font-style: normal; - font-weight: 700; - line-height: 2.8rem; - letter-spacing: -0.018rem; -`; - -export const regular18 = css` - font-family: Pretendard; - font-size: 1.8rem; - font-style: normal; - font-weight: 400; - line-height: 2.8rem; - letter-spacing: -0.018rem; -`; - -export const bold16 = css` - font-family: Pretendard; - font-size: 1.6rem; - font-style: normal; - font-weight: 700; - line-height: 2.6rem; - letter-spacing: -0.016rem; -`; - -export const regular16 = css` - font-family: Pretendard; - font-size: 1.6rem; - font-style: normal; - font-weight: 400; - line-height: 2.6rem; - letter-spacing: -0.016rem; -`; - -export const regular15 = css` - font-family: Pretendard; - font-size: 1.5rem; - font-style: normal; - font-weight: 400; - line-height: 2.2rem; - letter-spacing: -0.015rem; -`; - -export const bold15 = css` - font-family: Pretendard; - font-size: 1.5rem; - font-style: normal; - font-weight: 700; - line-height: 2.2rem; - letter-spacing: -0.015rem; -`; - -export const regular14 = css` - font-family: Pretendard; - font-size: 1.4rem; - font-style: normal; - font-weight: 400; - line-height: 2rem; - letter-spacing: -0.007rem; -`; - -export const bold14 = css` - font-family: Pretendard; - font-size: 1.4rem; - font-style: normal; - font-weight: 700; - line-height: 2rem; - letter-spacing: -0.007rem; -`; - -export const regular12 = css` - font-family: Pretendard; - font-size: 1.2rem; - font-style: normal; - font-weight: 400; - line-height: 1.8rem; - letter-spacing: -0.006rem; -`; From 582f32d8375d4979cdaee5bb55cd1ee719dde15d Mon Sep 17 00:00:00 2001 From: Hooni07 Date: Mon, 11 Mar 2024 21:42:30 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Fixed:=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/FontStyle.jsx | 127 +++++++++++++++++++++++++++++++++++++++ src/styles/Reset.js | 82 +++++++++++++++++++++++++ 2 files changed, 209 insertions(+) create mode 100644 src/styles/FontStyle.jsx create mode 100644 src/styles/Reset.js diff --git a/src/styles/FontStyle.jsx b/src/styles/FontStyle.jsx new file mode 100644 index 0000000..00d0564 --- /dev/null +++ b/src/styles/FontStyle.jsx @@ -0,0 +1,127 @@ +import { css } from 'styled-components'; + +export const bold28 = css` + font-family: Pretendard; + font-size: 2.8rem; + font-style: normal; + font-weight: 700; + line-height: 4.2rem; + letter-spacing: -0.028rem; +`; + +export const bold24 = css` + font-family: Pretendard; + font-size: 2.4rem; + font-style: normal; + font-weight: 700; + line-height: 3.6rem; + letter-spacing: -0.028rem; +`; + +export const regular24 = css` + font-family: Pretendard; + font-size: 2.4rem; + font-style: normal; + font-weight: 400; + line-height: 3.6rem; + letter-spacing: -0.024rem; +`; + +export const bold20 = css` + font-family: Pretendard; + font-size: 2rem; + font-style: normal; + font-weight: 700; + line-height: 3rem; + letter-spacing: -0.02rem; +`; + +export const regular20 = css` + font-family: Pretendard; + font-size: 2rem; + font-style: normal; + font-weight: 400; + line-height: 3rem; + letter-spacing: -0.02rem; +`; + +export const bold18 = css` + font-family: Pretendard; + font-size: 1.8rem; + font-style: normal; + font-weight: 700; + line-height: 2.8rem; + letter-spacing: -0.018rem; +`; + +export const regular18 = css` + font-family: Pretendard; + font-size: 1.8rem; + font-style: normal; + font-weight: 400; + line-height: 2.8rem; + letter-spacing: -0.018rem; +`; + +export const bold16 = css` + font-family: Pretendard; + font-size: 1.6rem; + font-style: normal; + font-weight: 700; + line-height: 2.6rem; + letter-spacing: -0.016rem; +`; + +export const regular16 = css` + font-family: Pretendard; + font-size: 1.6rem; + font-style: normal; + font-weight: 400; + line-height: 2.6rem; + letter-spacing: -0.016rem; +`; + +export const regular15 = css` + font-family: Pretendard; + font-size: 1.5rem; + font-style: normal; + font-weight: 400; + line-height: 2.2rem; + letter-spacing: -0.015rem; +`; + +export const bold15 = css` + font-family: Pretendard; + font-size: 1.5rem; + font-style: normal; + font-weight: 700; + line-height: 2.2rem; + letter-spacing: -0.015rem; +`; + +export const regular14 = css` + font-family: Pretendard; + font-size: 1.4rem; + font-style: normal; + font-weight: 400; + line-height: 2rem; + letter-spacing: -0.007rem; +`; + +export const bold14 = css` + font-family: Pretendard; + font-size: 1.4rem; + font-style: normal; + font-weight: 700; + line-height: 2rem; + letter-spacing: -0.007rem; +`; + +export const regular12 = css` + font-family: Pretendard; + font-size: 1.2rem; + font-style: normal; + font-weight: 400; + line-height: 1.8rem; + letter-spacing: -0.006rem; +`; diff --git a/src/styles/Reset.js b/src/styles/Reset.js new file mode 100644 index 0000000..3c61a13 --- /dev/null +++ b/src/styles/Reset.js @@ -0,0 +1,82 @@ +import { css } from 'styled-components'; + +const reset = css` + * { + margin: 0; + padding: 0; + box-sizing: border-box; + color: inherit; + word-break: keep-all; + } + + :root { + --z-index-nav: 100; + } + + a { + color: inherit; + text-decoration: none; + cursor: pointer; + } + + button { + border: none; + padding: unset; + background-color: unset; + cursor: pointer; + } + + input { + border: none; + padding: none; + } + + input:focus { + outline: none; + } + + input[type='search']::-webkit-search-decoration, + input[type='search']::-webkit-search-cancel-button, + input[type='search']::-webkit-search-results-button, + input[type='search']::-webkit-search-results-decoration { + display: none; + } + + .align-right { + text-align: right; + } + + .align-center { + text-align: center; + } + + .align-justify { + text-align: justify; + } + + .size-large { + font-size: 1.5em; + } + + .size-small { + font-size: 0.75em; + } + + .noto-sans { + font-family: 'Noto Sans', sans-serif !important; + } + + .pretendard { + font-family: 'Pretendard', sans-serif !important; + } + + .nanum-gothic { + font-family: 'Nanum Gothic', sans-serif !important; + } + + .nanum-myeongjo { + font-family: 'Nanum Myeongjo', serif !important; + } +`; + +export default reset;