From 631c4c55ac08846199da5c5d315d83e1c6b82a15 Mon Sep 17 00:00:00 2001 From: Hideaki Takahashi Date: Thu, 4 Jan 2024 00:58:12 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8E=A8=20chore:=20modern-css-reset?= =?UTF-8?q?=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .storybook/preview.tsx | 1 - docs/tech.md | 1 - package.json | 1 - src/pages/_app.tsx | 1 - yarn.lock | 8 -------- 5 files changed, 12 deletions(-) diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 339e651d..104268b2 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -4,7 +4,6 @@ import React from 'react'; import { colors } from '../src/styles/themes.css'; import type { Parameters } from '@storybook/react'; -import 'modern-css-reset/dist/reset.min.css'; export const parameters: Parameters = { controls: { diff --git a/docs/tech.md b/docs/tech.md index b0d30f07..6b58e465 100644 --- a/docs/tech.md +++ b/docs/tech.md @@ -28,7 +28,6 @@ ## スタイリング -- [modern-css-reset](https://github.com/hankchizljaw/modern-css-reset) - [vanilla-extract](https://vanilla-extract.style) - [Sprinkles](https://vanilla-extract.style/documentation/packages/sprinkles) - [Recipes](https://vanilla-extract.style/documentation/packages/recipes) diff --git a/package.json b/package.json index fb3625a3..e909b4ab 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,6 @@ "lint-staged": "^12.1.2", "micromatch": "^4.0.5", "minimist": "^1.2.8", - "modern-css-reset": "^1.4.0", "pathpida": "^0.20.1", "prettier": "^2.8.3", "serve": "^14.2.1", diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index 928543a8..f61a2e53 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -1,4 +1,3 @@ -import 'modern-css-reset/dist/reset.min.css'; import Head from 'next/head'; import { cica } from '@/styles/font'; diff --git a/yarn.lock b/yarn.lock index 63ebae16..6d2e9bb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12764,13 +12764,6 @@ __metadata: languageName: node linkType: hard -"modern-css-reset@npm:^1.4.0": - version: 1.4.0 - resolution: "modern-css-reset@npm:1.4.0" - checksum: b69603972fd4b5f03ced962c0c6c81447b2f343e33b396e86413501c14a873b20c532337b21fa0a7017a24c37fe134482e3dae36feb549f28bc02bd46adbc40b - languageName: node - linkType: hard - "mri@npm:^1.2.0": version: 1.2.0 resolution: "mri@npm:1.2.0" @@ -13233,7 +13226,6 @@ __metadata: lint-staged: "npm:^12.1.2" micromatch: "npm:^4.0.5" minimist: "npm:^1.2.8" - modern-css-reset: "npm:^1.4.0" next: "npm:14.0.3" pathpida: "npm:^0.20.1" prettier: "npm:^2.8.3" From 38ae77308a9dbb3d9ff2b3ad20f2326190fec3ea Mon Sep 17 00:00:00 2001 From: Hideaki Takahashi Date: Thu, 4 Jan 2024 00:59:13 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=8E=A8=20chore:=20@acab/reset.css?= =?UTF-8?q?=E3=81=AE=E5=B0=8E=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cspell.json | 1 + docs/tech.md | 1 + package.json | 1 + yarn.lock | 8 ++++++++ 4 files changed, 11 insertions(+) diff --git a/.cspell.json b/.cspell.json index bcaa713c..89dedb31 100644 --- a/.cspell.json +++ b/.cspell.json @@ -16,6 +16,7 @@ { "filename": "**", "words": [ + "acab", "authtoken", "autodocs", "BCCD", diff --git a/docs/tech.md b/docs/tech.md index 6b58e465..85c8efac 100644 --- a/docs/tech.md +++ b/docs/tech.md @@ -28,6 +28,7 @@ ## スタイリング +- [@acab/reset.css](https://github.com/mayank99/reset.css) - [vanilla-extract](https://vanilla-extract.style) - [Sprinkles](https://vanilla-extract.style/documentation/packages/sprinkles) - [Recipes](https://vanilla-extract.style/documentation/packages/recipes) diff --git a/package.json b/package.json index e909b4ab..71848d2a 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "clean:cspell": "ts-node src/scripts/cleanCspellWords.ts" }, "dependencies": { + "@acab/reset.css": "^0.8.0", "@headlessui/react": "^1.7.4", "@hookform/resolvers": "^2.9.11", "clsx": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 6d2e9bb8..c7fba4b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,6 +12,13 @@ __metadata: languageName: node linkType: hard +"@acab/reset.css@npm:^0.8.0": + version: 0.8.0 + resolution: "@acab/reset.css@npm:0.8.0" + checksum: 9e98c3ec7490ec9b76be75051a41d06fc8cccbd2bfef8bed419b7aa380a5f8abd56b8a98c871163436a1034e581e7f62fb9ebdb87315248ccbbd7a6f474dc0af + languageName: node + linkType: hard + "@ampproject/remapping@npm:^2.2.0": version: 2.2.1 resolution: "@ampproject/remapping@npm:2.2.1" @@ -13188,6 +13195,7 @@ __metadata: version: 0.0.0-use.local resolution: "official@workspace:." dependencies: + "@acab/reset.css": "npm:^0.8.0" "@headlessui/react": "npm:^1.7.4" "@hookform/resolvers": "npm:^2.9.11" "@ls-lint/ls-lint": "npm:^2.0.0" From c010d28353125906942fcd439763e1412782d387 Mon Sep 17 00:00:00 2001 From: Hideaki Takahashi Date: Thu, 4 Jan 2024 01:08:01 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E2=9C=A8=20feat:=20@acab/reset.css?= =?UTF-8?q?=E3=81=AE=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .storybook/preview.tsx | 1 + src/pages/_app.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 104268b2..d263982c 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -3,6 +3,7 @@ import React from 'react'; import { colors } from '../src/styles/themes.css'; +import '@acab/reset.css'; import type { Parameters } from '@storybook/react'; export const parameters: Parameters = { diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx index f61a2e53..88624058 100644 --- a/src/pages/_app.tsx +++ b/src/pages/_app.tsx @@ -1,3 +1,4 @@ +import '@acab/reset.css'; import Head from 'next/head'; import { cica } from '@/styles/font';