Merge remote-tracking branch 'upstream/master' into feat-jar-plugin

README.md

@@ -32,7 +32,7 @@ You can see it in action [here](https://minecraft.rtgame.co.uk/map/build)
 | Login/register | ✅ | n/a |
 | Inactivity timeout | ❌ | n/a |
 | Custom player head URLs | n/a | ❌ | 
-| Custom map icons | ❌ | ❌ |
+| Custom map icons | ✅ | ✅ |
 
 ## Supported Browsers
 - Chrome 66+

package.json

@@ -19,24 +19,24 @@
     "@soerenmartius/vue3-clipboard": "^0.1",
     "leaflet": "git+https://github.com/JLyne/leaflet.git",
     "modern-normalize": "^1.1.0",
-    "vue": "^3.2.19",
+    "vue": "^3.2.20",
     "vuex": "^4.0"
   },
   "devDependencies": {
     "@types/jest": "^27.0.2",
     "@types/jest-in-case": "^1.0.5",
     "@types/leaflet": "1.7.5",
-    "@types/node": "^16.10.2",
-    "@typescript-eslint/eslint-plugin": "^4.32",
-    "@typescript-eslint/parser": "^4.32",
+    "@types/node": "^16.10.3",
+    "@typescript-eslint/eslint-plugin": "^4.33",
+    "@typescript-eslint/parser": "^4.33",
     "@vitejs/plugin-vue": "^1.9",
     "@vue/compiler-sfc": "^3.2.18",
     "@vue/eslint-config-typescript": "^7.0",
     "@vue/test-utils": "^2.0.0-rc.15",
     "cpy-cli": "^3.1.1",
     "eslint": "^7.32",
-    "eslint-plugin-vue": "^7.18",
-    "jest": "^27.2.4",
+    "eslint-plugin-vue": "^7.19",
+    "jest": "^27.2.5",
     "jest-in-case": "^1.0.2",
     "npm-run-all": "^4.1.5",
     "patch-package": "^6.4",
@@ -49,7 +49,7 @@
     "vite": "^2.6",
     "vite-plugin-svg-sprite-component": "^1.0",
     "vue-jest": "^5.0.0-alpha.10",
-    "vue-tsc": "0.3.0"
+    "vue-tsc": "0.28.1"
   },
   "eslintConfig": {
     "root": true,

src/scss/leaflet/_markers.scss

@@ -45,15 +45,16 @@
 			grid-template-columns: min-content 1fr;
 			grid-template-rows: 1fr min-content min-content min-content 1fr;
 			grid-auto-flow: column;
-			column-gap: 0.5rem;
 			margin-left: 1.6rem;
 			background-clip: padding-box;
-			padding-right: 0.5rem;
+			padding: 0.2rem 0.5rem;
 			align-items: center;
 		}
 
 		.player__icon {
 			grid-row: 1 / -1;
+			margin-right: 0.5rem;
+			margin-left: -0.3rem;
 		}
 
 		.player__name {