diff --git a/apps/web/package.json b/apps/web/package.json index d770551..ef9f72a 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -28,8 +28,8 @@ "dayjs": "^1.11.10", "mobx": "^6.12.0", "mobx-react-lite": "^4.0.5", + "modern-normalize": "^2.0.0", "next": "^14.1.0", - "normalize.css": "^8.0.1", "radash": "^11.0.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/apps/web/pages/_app.jsx b/apps/web/pages/_app.jsx index b4de8ef..3660ed9 100644 --- a/apps/web/pages/_app.jsx +++ b/apps/web/pages/_app.jsx @@ -1,4 +1,3 @@ -import 'normalize.css'; import '../styles/fonts.css'; import '../styles/globals.css'; import '../styles/antd-fix.css'; diff --git a/apps/web/styles/globals.css b/apps/web/styles/globals.css index 99fcc36..3f4089c 100644 --- a/apps/web/styles/globals.css +++ b/apps/web/styles/globals.css @@ -1,17 +1,5 @@ -html, body { background-color: var(--color-background); - padding: 0; - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, - Fira Sans, Droid Sans, Helvetica Neue, sans-serif; } -a { - color: inherit; - text-decoration: none; -} - -* { - box-sizing: border-box; -} +@import 'node_modules/modern-normalize/modern-normalize.css'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3d1f845..1d61b84 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -162,12 +162,12 @@ importers: mobx-react-lite: specifier: ^4.0.5 version: 4.0.5(mobx@6.12.0)(react-dom@18.2.0)(react@18.2.0) + modern-normalize: + specifier: ^2.0.0 + version: 2.0.0 next: specifier: ^14.1.0 version: 14.1.0(@babel/core@7.23.9)(react-dom@18.2.0)(react@18.2.0) - normalize.css: - specifier: ^8.0.1 - version: 8.0.1 radash: specifier: ^11.0.0 version: 11.0.0 @@ -10433,6 +10433,11 @@ packages: resolution: {integrity: sha512-Mn6CN6meXEnMa0a5u6a5+RKrqRedHBhZGd15AWLk9O6uFY4KYHzImdt8JI8WODo1bjTSRnwXhJox+FCUZhCKCQ==} dev: false + /modern-normalize@2.0.0: + resolution: {integrity: sha512-CxBoEVKh5U4DH3XuNbc5ONLF6dQBc8dSc7pdZ1957FGbIO5JBqGqqchhET9dTexri8/pk9xBL6+5ceOtCIp1QA==} + engines: {node: '>=6'} + dev: false + /ms@2.0.0: resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==} @@ -10639,10 +10644,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /normalize.css@8.0.1: - resolution: {integrity: sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==} - dev: false - /npm-run-path@4.0.1: resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==} engines: {node: '>=8'}