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

chore: 공용 스타일 파일 디테일 수정 #19

Merged
merged 4 commits into from
Dec 20, 2024
Merged

chore: 공용 스타일 파일 디테일 수정 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32dc3db
chore: next-config 수정
Dec 20, 2024
01dd267
chore: nextconfig 변수 변경
Dec 20, 2024
79a5ef4
chore: asset 명 변경
Dec 20, 2024
5f9dfaf
chore: 공용 scss 파일 수정
Dec 20, 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
3 changes: 2 additions & 1 deletion next.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import type { NextConfig } from 'next';
import path from 'path';
import { NextConfig } from 'next';

const nextConfig: NextConfig = {
reactStrictMode: true,
sassOptions: {
includePaths: [path.join(__dirname, 'src')],
additionalData: `@use '@/asset/variables' as *;`,
},
};

Expand Down
3 changes: 1 addition & 2 deletions src/app/globals.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@use '@/_asset/variables.scss' as *;
@import url('https://cdn.jsdelivr.net/gh/orioncactus/[email protected]/dist/web/variable/pretendardvariable.min.css');
@import '@/_asset/reset.scss';
@import '@/asset/reset.scss';

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✋질문 있습니다.
기존 방식이 globals에서 reset, variables를 import해서 관리하는 방식이었잖아요?
variables는 config에서 전역으로 사용 가능하게 바꾸신 거고요.
reset도 config에 추가해서 사용하는 게 가능할까요??
어차피 variables처럼 전역으로 사용되는 파일이니까??

body {
font-family: Pretendard;
Expand Down
1 change: 0 additions & 1 deletion src/_asset/reset.scss → src/asset/reset.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use '@/_asset/variables' as *;
* {
padding: 0;
margin: 0;
Expand Down
11 changes: 6 additions & 5 deletions src/_asset/variables.scss → src/asset/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

섬세함 👍

$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;
Expand Down
Loading