Skirda/LiveAtlas
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to modern-normalize

Browse Source
This commit is contained in:
James Lyne 2021-09-08 19:28:39 +01:00
parent 63a00d0681
commit 6450b76439
4 changed files with 64 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package-lock.json generated
View File

@ -12,7 +12,7 @@
"@kyvg/vue3-notification": "2.3.0", "@kyvg/vue3-notification": "2.3.0",
"@soerenmartius/vue3-clipboard": "^0.1", "@soerenmartius/vue3-clipboard": "^0.1",
"leaflet": "git+https://github.com/JLyne/leaflet.git", "leaflet": "git+https://github.com/JLyne/leaflet.git",
"normalize-scss": "^7.0", "modern-normalize": "^1.1.0",
"vue": "^3.2.8", "vue": "^3.2.8",
"vuex": "^4.0" "vuex": "^4.0"
}, },
@ -2303,6 +2303,17 @@
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
"dev": true "dev": true
}, },
"node_modules/modern-normalize": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz",
"integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA==",
"engines": {
"node": ">=6"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/ms": { "node_modules/ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@ -2342,11 +2353,6 @@
"node": ">=0.10.0" "node": ">=0.10.0"
} }
}, },
"node_modules/normalize-scss": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/normalize-scss/-/normalize-scss-7.0.1.tgz",
"integrity": "sha512-qj16bWnYs+9/ac29IgGjySg4R5qQTp1lXfm7ApFOZNVBYFY8RZ3f8+XQNDDLHeDtI3Ba7Jj4+LuPgz9v/fne2A=="
},
"node_modules/object-assign": { "node_modules/object-assign": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@ -5602,6 +5608,11 @@
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
"dev": true "dev": true
}, },
"modern-normalize": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/modern-normalize/-/modern-normalize-1.1.0.tgz",
"integrity": "sha512-2lMlY1Yc1+CUy0gw4H95uNN7vjbpoED7NNRSBHE25nWfLBdmMzFCsPshlzbxHz+gYMcBEUN8V4pU16prcdPSgA=="
},
"ms": { "ms": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@ -5632,11 +5643,6 @@
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
"dev": true "dev": true
}, },
"normalize-scss": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/normalize-scss/-/normalize-scss-7.0.1.tgz",
"integrity": "sha512-qj16bWnYs+9/ac29IgGjySg4R5qQTp1lXfm7ApFOZNVBYFY8RZ3f8+XQNDDLHeDtI3Ba7Jj4+LuPgz9v/fne2A=="
},
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",

2
package.json
View File

@ -14,7 +14,7 @@
"@kyvg/vue3-notification": "2.3.0", "@kyvg/vue3-notification": "2.3.0",
"@soerenmartius/vue3-clipboard": "^0.1", "@soerenmartius/vue3-clipboard": "^0.1",
"leaflet": "git+https://github.com/JLyne/leaflet.git", "leaflet": "git+https://github.com/JLyne/leaflet.git",
"normalize-scss": "^7.0", "modern-normalize": "^1.1.0",
"vue": "^3.2.8", "vue": "^3.2.8",
"vuex": "^4.0" "vuex": "^4.0"
}, },

45
patches/modern-normalize+1.1.0.patch Normal file
View File

@ -0,0 +1,45 @@
diff --git a/node_modules/modern-normalize/modern-normalize.css b/node_modules/modern-normalize/modern-normalize.css
index ad3b58c..aeb06e6 100644
--- a/node_modules/modern-normalize/modern-normalize.css
+++ b/node_modules/modern-normalize/modern-normalize.css
@@ -5,16 +5,6 @@ Document
========
*/
-/**
-Use a better box model (opinionated).
-*/
-
-*,
-::before,
-::after {
- box-sizing: border-box;
-}
-
/**
Use a more readable tab size (opinionated).
*/
@@ -47,23 +37,6 @@ body {
margin: 0;
}
-/**
-Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
-*/
-
-body {
- font-family:
- system-ui,
- -apple-system, /* Firefox supports this but not yet `system-ui` */
- 'Segoe UI',
- Roboto,
- Helvetica,
- Arial,
- sans-serif,
- 'Apple Color Emoji',
- 'Segoe UI Emoji';
-}
-
/*
Grouping content
================

2
src/main.ts
View File

@ -18,8 +18,8 @@ import { createApp } from 'vue'
import App from './App.vue'; import App from './App.vue';
import {store} from "@/store"; import {store} from "@/store";
import 'modern-normalize/modern-normalize.css';
import 'leaflet/dist/leaflet.css'; import 'leaflet/dist/leaflet.css';
import 'normalize-scss/sass/normalize/_import-now.scss';
import '@/scss/style.scss'; import '@/scss/style.scss';
import {MutationTypes} from "@/store/mutation-types"; import {MutationTypes} from "@/store/mutation-types";