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

This commit is contained in:
SNDST00M: M.U.N.I.N 2021-10-09 15:12:17 +01:00
commit 33775efd73
No known key found for this signature in database
GPG Key ID: 0C7CE6F01FC333C5
4 changed files with 1508 additions and 1785 deletions

View File

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

3272
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

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

View File

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