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.

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

@acab/reset.cssの導入 #350

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
{
"filename": "**",
"words": [
"acab",
"authtoken",
"autodocs",
"BCCD",
Expand Down
2 changes: 1 addition & 1 deletion .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import React from 'react';

import { colors } from '../src/styles/themes.css';

import '@acab/reset.css';
tyokinuhata marked this conversation as resolved.
Show resolved Hide resolved
import type { Parameters } from '@storybook/react';
import 'modern-css-reset/dist/reset.min.css';

export const parameters: Parameters = {
controls: {
Expand Down
2 changes: 1 addition & 1 deletion docs/tech.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

## スタイリング

- [modern-css-reset](https://github.com/hankchizljaw/modern-css-reset)
- [@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)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -70,7 +71,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",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'modern-css-reset/dist/reset.min.css';
import '@acab/reset.css';
import Head from 'next/head';

import { cica } from '@/styles/font';
Expand Down
16 changes: 8 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -12764,13 +12771,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"
Expand Down Expand Up @@ -13195,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"
Expand Down Expand Up @@ -13233,7 +13234,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"
Expand Down