From 6450b76439b271daa8db4304d3ef68c394f2aad0 Mon Sep 17 00:00:00 2001
From: James Lyne <jim+github@not-null.co.uk>
Date: Wed, 8 Sep 2021 19:28:39 +0100
Subject: [PATCH] Switch to modern-normalize

---
 package-lock.json                    | 28 ++++++++++-------
 package.json                         |  2 +-
 patches/modern-normalize+1.1.0.patch | 45 ++++++++++++++++++++++++++++
 src/main.ts                          |  2 +-
 4 files changed, 64 insertions(+), 13 deletions(-)
 create mode 100644 patches/modern-normalize+1.1.0.patch

diff --git a/package-lock.json b/package-lock.json
index 07fdb30..9abdcc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
         "@kyvg/vue3-notification": "2.3.0",
         "@soerenmartius/vue3-clipboard": "^0.1",
         "leaflet": "git+https://github.com/JLyne/leaflet.git",
-        "normalize-scss": "^7.0",
+        "modern-normalize": "^1.1.0",
         "vue": "^3.2.8",
         "vuex": "^4.0"
       },
@@ -2303,6 +2303,17 @@
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "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": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -2342,11 +2353,6 @@
         "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": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -5602,6 +5608,11 @@
       "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "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": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -5632,11 +5643,6 @@
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "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": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
diff --git a/package.json b/package.json
index c12fdce..a4d7e60 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "@kyvg/vue3-notification": "2.3.0",
     "@soerenmartius/vue3-clipboard": "^0.1",
     "leaflet": "git+https://github.com/JLyne/leaflet.git",
-    "normalize-scss": "^7.0",
+    "modern-normalize": "^1.1.0",
     "vue": "^3.2.8",
     "vuex": "^4.0"
   },
diff --git a/patches/modern-normalize+1.1.0.patch b/patches/modern-normalize+1.1.0.patch
new file mode 100644
index 0000000..a94570d
--- /dev/null
+++ b/patches/modern-normalize+1.1.0.patch
@@ -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
+ ================
diff --git a/src/main.ts b/src/main.ts
index 8c42515..944725c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,8 +18,8 @@ import { createApp } from 'vue'
 import App from './App.vue';
 import {store} from "@/store";
 
+import 'modern-normalize/modern-normalize.css';
 import 'leaflet/dist/leaflet.css';
-import 'normalize-scss/sass/normalize/_import-now.scss';
 import '@/scss/style.scss';
 
 import {MutationTypes} from "@/store/mutation-types";