From 32dc3db270e167be17600b8395e562adda1904f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=88=98=EC=A7=84?= Date: Fri, 20 Dec 2024 17:09:25 +0900 Subject: [PATCH 1/4] =?UTF-8?q?chore:=20next-config=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.ts | 1 + src/_asset/reset.scss | 1 - src/app/globals.scss | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/next.config.ts b/next.config.ts index b16851a..4a72e36 100644 --- a/next.config.ts +++ b/next.config.ts @@ -5,6 +5,7 @@ const nextConfig: NextConfig = { reactStrictMode: true, sassOptions: { includePaths: [path.join(__dirname, 'src')], + additionalData: `@use '@/assets/variables' as *;`, }, }; diff --git a/src/_asset/reset.scss b/src/_asset/reset.scss index c796aed..d2ab6c3 100644 --- a/src/_asset/reset.scss +++ b/src/_asset/reset.scss @@ -1,4 +1,3 @@ -@use '@/_asset/variables' as *; * { padding: 0; margin: 0; diff --git a/src/app/globals.scss b/src/app/globals.scss index 15d047c..e310321 100644 --- a/src/app/globals.scss +++ b/src/app/globals.scss @@ -1,4 +1,3 @@ -@use '@/_asset/variables.scss' as *; @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable.min.css'); @import '@/_asset/reset.scss'; From 01dd267f497b9bb78d719e02b96f01b88963db47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=88=98=EC=A7=84?= Date: Fri, 20 Dec 2024 17:16:44 +0900 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20nextconfig=20=EB=B3=80=EC=88=98=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 --- next.config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next.config.ts b/next.config.ts index 4a72e36..edf4276 100644 --- a/next.config.ts +++ b/next.config.ts @@ -1,4 +1,4 @@ -import type { NextConfig } from 'next'; +import { NextConfig } from 'next'; import path from 'path'; const nextConfig: NextConfig = { From 79a5ef450e704153d8296948b6c203b5feac61af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=88=98=EC=A7=84?= Date: Fri, 20 Dec 2024 17:21:39 +0900 Subject: [PATCH 3/4] =?UTF-8?q?chore:=20asset=20=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/next.config.ts b/next.config.ts index edf4276..ebf2075 100644 --- a/next.config.ts +++ b/next.config.ts @@ -1,11 +1,11 @@ -import { NextConfig } from 'next'; import path from 'path'; +import { NextConfig } from 'next'; const nextConfig: NextConfig = { reactStrictMode: true, sassOptions: { includePaths: [path.join(__dirname, 'src')], - additionalData: `@use '@/assets/variables' as *;`, + additionalData: `@use '@/_asset/variables' as *;`, }, }; From 5f9dfaf5d6e38fb72d5da6ef9bbd502cc74ad165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=88=98=EC=A7=84?= Date: Fri, 20 Dec 2024 21:23:52 +0900 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=EA=B3=B5=EC=9A=A9=20scss=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- next.config.ts | 2 +- src/app/globals.scss | 2 +- src/{_asset => asset}/reset.scss | 0 src/{_asset => asset}/variables.scss | 11 ++++++----- 4 files changed, 8 insertions(+), 7 deletions(-) rename src/{_asset => asset}/reset.scss (100%) rename src/{_asset => asset}/variables.scss (80%) diff --git a/next.config.ts b/next.config.ts index ebf2075..8667d5e 100644 --- a/next.config.ts +++ b/next.config.ts @@ -5,7 +5,7 @@ const nextConfig: NextConfig = { reactStrictMode: true, sassOptions: { includePaths: [path.join(__dirname, 'src')], - additionalData: `@use '@/_asset/variables' as *;`, + additionalData: `@use '@/asset/variables' as *;`, }, }; diff --git a/src/app/globals.scss b/src/app/globals.scss index e310321..6387d06 100644 --- a/src/app/globals.scss +++ b/src/app/globals.scss @@ -1,5 +1,5 @@ @import url('https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/variable/pretendardvariable.min.css'); -@import '@/_asset/reset.scss'; +@import '@/asset/reset.scss'; body { font-family: Pretendard; diff --git a/src/_asset/reset.scss b/src/asset/reset.scss similarity index 100% rename from src/_asset/reset.scss rename to src/asset/reset.scss diff --git a/src/_asset/variables.scss b/src/asset/variables.scss similarity index 80% rename from src/_asset/variables.scss rename to src/asset/variables.scss index 674bbdb..2da6dc3 100644 --- a/src/_asset/variables.scss +++ b/src/asset/variables.scss @@ -16,12 +16,13 @@ $green: #05d58b; $pink: #ff2f9f; $red: #ff0000; -$radius: 8px; -$radi-rank: 50px; -$radi-category-small: 6px; -$radi-category-filter: 100px; -$radi-modal: 16px; +$radius-common: 8px; +$radius-rank: 50px; +$radius-category-small: 6px; +$radius-category-filter: 100px; +$radius-modal: 16px; +$border-none: none; $border-red: 1px solid $red; $border-black: 1px solid $mood-black; $border-blue: 1px solid $blue;