Archives/tobspr_shapez.io
1
0
Fork 0
mirror of https://github.com/tobspr/shapez.io.git synced 2025-12-09 16:21:51 +00:00
Code Issues Projects Releases Wiki Activity

Minor CSS changes

Browse Source 
Remove PostCSS plugins that are no longer needed, fix some styles and
partially remove the need to use a .keybinding class on kbd elements.
This commit is contained in:
Даниїл Григор'єв 2025-07-20 18:13:07 +03:00
parent 2240c00090
commit bcda036c73
No known key found for this signature in database
GPG Key ID: B890DF16341D8C1D
15 changed files with 26 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gulp/css.js
View File

@ -10,8 +10,6 @@ import gulpPostcss from "gulp-postcss";
import gulpRename from "gulp-rename";
import postcssAssets from "postcss-assets";
import postcssCriticalSplit from "postcss-critical-split";
import postcssPresetEnv from "postcss-preset-env";
import postcssRoundSubpixels from "postcss-round-subpixels";
// The assets plugin copies the files
const postcssAssetsPlugin = postcssAssets({
@ -24,12 +22,6 @@ const postcssAssetsPlugin = postcssAssets({
const postcssPlugins = prod => {
const plugins = [postcssAssetsPlugin];
if (prod) {
plugins.unshift(
postcssPresetEnv({
browsers: ["> 0.1%"],
})
);
plugins.push(
cssMqpacker({
sort: true,
@ -45,8 +37,7 @@ const postcssPlugins = prod => {
zindex: true,
},
],
}),
postcssRoundSubpixels()
})
);
}
return plugins;

688
package-lock.json generated
View File

@ -55,8 +55,6 @@
"imagemin-pngquant": "^8.0.0",
"postcss-assets": "^5.0.0",
"postcss-critical-split": "^2.5.3",
"postcss-preset-env": "^6.5.0",
"postcss-round-subpixels": "^1.2.0",
"prettier": "^3.3.2",
"terser-webpack-plugin": "^5.3.14",
"ts-loader": "^9.5.2",
@ -92,16 +90,6 @@
"node": ">=6.9.0"
}
},
"node_modules/@csstools/convert-colors": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
"integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==",
"dev": true,
"license": "CC0-1.0",
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/@electron/asar": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz",
@ -4108,9 +4096,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001726",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001726.tgz",
"integrity": "sha512-VQAUIUzBiZ/UnlM28fSp2CRF3ivUn1BWEvxMcVTNwpw91Py1pGbPIyIKtd+tzct9C3ouceCVdGAXxZOpZAsgdw==",
"version": "1.0.30001727",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz",
"integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==",
"dev": true,
"funding": [
{
@ -4881,22 +4869,6 @@
"semver": "bin/semver"
}
},
"node_modules/css-blank-pseudo": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
"integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.5"
},
"bin": {
"css-blank-pseudo": "cli.js"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/css-color-names": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@ -4921,38 +4893,6 @@
"node": ">4"
}
},
"node_modules/css-has-pseudo": {
"version": "0.10.0",
"resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
"integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.6",
"postcss-selector-parser": "^5.0.0-rc.4"
},
"bin": {
"css-has-pseudo": "cli.js"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/css-has-pseudo/node_modules/postcss-selector-parser": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"cssesc": "^2.0.0",
"indexes-of": "^1.0.1",
"uniq": "^1.0.1"
},
"engines": {
"node": ">=4"
}
},
"node_modules/css-mqpacker": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/css-mqpacker/-/css-mqpacker-7.0.0.tgz",
@ -4967,22 +4907,6 @@
"mqpacker": "bin/mqpacker.js"
}
},
"node_modules/css-prefers-color-scheme": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
"integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.5"
},
"bin": {
"css-prefers-color-scheme": "cli.js"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/css-select": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
@ -5030,26 +4954,6 @@
"url": "https://github.com/sponsors/fb55"
}
},
"node_modules/cssdb": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
"integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==",
"dev": true,
"license": "CC0-1.0"
},
"node_modules/cssesc": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
"integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
"dev": true,
"license": "MIT",
"bin": {
"cssesc": "bin/cssesc"
},
"engines": {
"node": ">=4"
}
},
"node_modules/cssnano": {
"version": "4.1.11",
"resolved": "https://registry.npmjs.org/cssnano/-/cssnano-4.1.11.tgz",
@ -7486,13 +7390,6 @@
"dev": true,
"license": "ISC"
},
"node_modules/flatten": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
"integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
"dev": true,
"license": "MIT"
},
"node_modules/fluent-ffmpeg": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.1.3.tgz",
@ -11205,13 +11102,6 @@
"node": ">=10"
}
},
"node_modules/js-base64": {
"version": "2.6.4",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz",
"integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
"dev": true,
"license": "BSD-3-Clause"
},
"node_modules/js-yaml": {
"version": "3.14.1",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
@ -13781,44 +13671,6 @@
"node": ">=4.0.0"
}
},
"node_modules/postcss-attribute-case-insensitive": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz",
"integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2",
"postcss-selector-parser": "^6.0.2"
}
},
"node_modules/postcss-attribute-case-insensitive/node_modules/cssesc": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
"integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
"dev": true,
"license": "MIT",
"bin": {
"cssesc": "bin/cssesc"
},
"engines": {
"node": ">=4"
}
},
"node_modules/postcss-attribute-case-insensitive/node_modules/postcss-selector-parser": {
"version": "6.0.11",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz",
"integrity": "sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==",
"dev": true,
"license": "MIT",
"dependencies": {
"cssesc": "^3.0.0",
"util-deprecate": "^1.0.2"
},
"engines": {
"node": ">=4"
}
},
"node_modules/postcss-calc": {
"version": "7.0.5",
"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
@ -13865,78 +13717,6 @@
"dev": true,
"license": "MIT"
},
"node_modules/postcss-color-functional-notation": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
"integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-color-gray": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
"integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
"dev": true,
"license": "ISC",
"dependencies": {
"@csstools/convert-colors": "^1.4.0",
"postcss": "^7.0.5",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-color-hex-alpha": {
"version": "5.0.3",
"resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
"integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.14",
"postcss-values-parser": "^2.0.1"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-color-mod-function": {
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
"integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"@csstools/convert-colors": "^1.4.0",
"postcss": "^7.0.2",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-color-rebeccapurple": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
"integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-colormin": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-4.0.3.tgz",
@ -14022,91 +13802,6 @@
"node": ">=4.0.0"
}
},
"node_modules/postcss-custom-media": {
"version": "7.0.8",
"resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
"integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.14"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-custom-properties": {
"version": "8.0.11",
"resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
"integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.17",
"postcss-values-parser": "^2.0.1"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-custom-selectors": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
"integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2",
"postcss-selector-parser": "^5.0.0-rc.3"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-custom-selectors/node_modules/postcss-selector-parser": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"cssesc": "^2.0.0",
"indexes-of": "^1.0.1",
"uniq": "^1.0.1"
},
"engines": {
"node": ">=4"
}
},
"node_modules/postcss-dir-pseudo-class": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
"integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2",
"postcss-selector-parser": "^5.0.0-rc.3"
},
"engines": {
"node": ">=4.0.0"
}
},
"node_modules/postcss-dir-pseudo-class/node_modules/postcss-selector-parser": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"cssesc": "^2.0.0",
"indexes-of": "^1.0.1",
"uniq": "^1.0.1"
},
"engines": {
"node": ">=4"
}
},
"node_modules/postcss-discard-comments": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz",
@ -14174,70 +13869,6 @@
"node": ">=6.9.0"
}
},
"node_modules/postcss-double-position-gradients": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
"integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.5",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-env-function": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
"integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-focus-visible": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
"integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-focus-within": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
"integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-font-variant": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
"integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2"
}
},
"node_modules/postcss-functions": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz",
@ -14294,58 +13925,6 @@
"node": ">=4.0.0"
}
},
"node_modules/postcss-gap-properties": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
"integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-image-set-function": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
"integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-initial": {
"version": "3.0.4",
"resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.4.tgz",
"integrity": "sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2"
}
},
"node_modules/postcss-lab-function": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
"integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"@csstools/convert-colors": "^1.4.0",
"postcss": "^7.0.2",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-load-config": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
@ -14364,32 +13943,6 @@
"url": "https://opencollective.com/postcss/"
}
},
"node_modules/postcss-logical": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
"integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-media-minmax": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
"integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-merge-idents": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-4.0.1.tgz",
@ -14504,19 +14057,6 @@
"node": ">=6.9.0"
}
},
"node_modules/postcss-nesting": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
"integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-normalize-charset": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz",
@ -14667,121 +14207,6 @@
"node": ">=6.9.0"
}
},
"node_modules/postcss-overflow-shorthand": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
"integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-page-break": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
"integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2"
}
},
"node_modules/postcss-place": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
"integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2",
"postcss-values-parser": "^2.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-preset-env": {
"version": "6.7.1",
"resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.1.tgz",
"integrity": "sha512-rlRkgX9t0v2On33n7TK8pnkcYOATGQSv48J2RS8GsXhqtg+xk6AummHP88Y5mJo0TLJelBjePvSjScTNkj3+qw==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"autoprefixer": "^9.6.1",
"browserslist": "^4.6.4",
"caniuse-lite": "^1.0.30000981",
"css-blank-pseudo": "^0.1.4",
"css-has-pseudo": "^0.10.0",
"css-prefers-color-scheme": "^3.1.1",
"cssdb": "^4.4.0",
"postcss": "^7.0.17",
"postcss-attribute-case-insensitive": "^4.0.1",
"postcss-color-functional-notation": "^2.0.1",
"postcss-color-gray": "^5.0.0",
"postcss-color-hex-alpha": "^5.0.3",
"postcss-color-mod-function": "^3.0.3",
"postcss-color-rebeccapurple": "^4.0.1",
"postcss-custom-media": "^7.0.8",
"postcss-custom-properties": "^8.0.11",
"postcss-custom-selectors": "^5.1.2",
"postcss-dir-pseudo-class": "^5.0.0",
"postcss-double-position-gradients": "^1.0.0",
"postcss-env-function": "^2.0.2",
"postcss-focus-visible": "^4.0.0",
"postcss-focus-within": "^3.0.0",
"postcss-font-variant": "^4.0.0",
"postcss-gap-properties": "^2.0.0",
"postcss-image-set-function": "^3.0.1",
"postcss-initial": "^3.0.0",
"postcss-lab-function": "^2.0.1",
"postcss-logical": "^3.0.0",
"postcss-media-minmax": "^4.0.0",
"postcss-nesting": "^7.0.0",
"postcss-overflow-shorthand": "^2.0.0",
"postcss-page-break": "^2.0.0",
"postcss-place": "^4.0.1",
"postcss-pseudo-class-any-link": "^6.0.0",
"postcss-replace-overflow-wrap": "^3.0.0",
"postcss-selector-matches": "^4.0.0",
"postcss-selector-not": "^4.0.0"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-pseudo-class-any-link": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
"integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
"dev": true,
"license": "CC0-1.0",
"dependencies": {
"postcss": "^7.0.2",
"postcss-selector-parser": "^5.0.0-rc.3"
},
"engines": {
"node": ">=6.0.0"
}
},
"node_modules/postcss-pseudo-class-any-link/node_modules/postcss-selector-parser": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"cssesc": "^2.0.0",
"indexes-of": "^1.0.1",
"uniq": "^1.0.1"
},
"engines": {
"node": ">=4"
}
},
"node_modules/postcss-reduce-idents": {
"version": "4.0.2",
"resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-4.0.2.tgz",
@ -14828,98 +14253,6 @@
"node": ">=6.9.0"
}
},
"node_modules/postcss-replace-overflow-wrap": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
"integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^7.0.2"
}
},
"node_modules/postcss-round-subpixels": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/postcss-round-subpixels/-/postcss-round-subpixels-1.2.0.tgz",
"integrity": "sha512-eRGd4cTzQRqLrFnQ8kOB9HoczGr+8HjPvxn8pB+Ax1eDBFMXsvNWgFftKiQ152Jw7FrPPEzCef2cz2lnDynl/w==",
"dev": true,
"license": "MIT",
"dependencies": {
"postcss": "^5.0.2",
"postcss-value-parser": "^3.1.2"
}
},
"node_modules/postcss-round-subpixels/node_modules/has-flag": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
"integrity": "sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/postcss-round-subpixels/node_modules/postcss": {
"version": "5.2.18",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz",
"integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==",
"dev": true,
"license": "MIT",
"dependencies": {
"chalk": "^1.1.3",
"js-base64": "^2.1.9",
"source-map": "^0.5.6",
"supports-color": "^3.2.3"
},
"engines": {
"node": ">=0.12"
}
},
"node_modules/postcss-round-subpixels/node_modules/source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
"dev": true,
"license": "BSD-3-Clause",
"engines": {
"node": ">=0.10.0"
}
},
"node_modules/postcss-round-subpixels/node_modules/supports-color": {
"version": "3.2.3",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
"integrity": "sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==",
"dev": true,
"license": "MIT",
"dependencies": {
"has-flag": "^1.0.0"
},
"engines": {
"node": ">=0.8.0"
}
},
"node_modules/postcss-selector-matches": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
"integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
"dev": true,
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0",
"postcss": "^7.0.2"
}
},
"node_modules/postcss-selector-not": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz",
"integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"balanced-match": "^1.0.0",
"postcss": "^7.0.2"
}
},
"node_modules/postcss-selector-parser": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz",
@ -14972,21 +14305,6 @@
"dev": true,
"license": "MIT"
},
"node_modules/postcss-values-parser": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
"integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
"dev": true,
"license": "MIT",
"dependencies": {
"flatten": "^1.0.2",
"indexes-of": "^1.0.1",
"uniq": "^1.0.1"
},
"engines": {
"node": ">=6.14.4"
}
},
"node_modules/postcss-zindex": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-4.0.1.tgz",

2
package.json
View File

@ -66,8 +66,6 @@
"imagemin-pngquant": "^8.0.0",
"postcss-assets": "^5.0.0",
"postcss-critical-split": "^2.5.3",
"postcss-preset-env": "^6.5.0",
"postcss-round-subpixels": "^1.2.0",
"prettier": "^3.3.2",
"terser-webpack-plugin": "^5.3.14",
"ts-loader": "^9.5.2",

9
src/css/common.scss
View File

@ -78,7 +78,7 @@ button {
border-radius: 0.8 * $globalBorderRadius;
transition: opacity 0.12s ease-in-out;
.keybinding {
kbd {
bottom: -0.25rem;
right: -0.2rem;
}
@ -459,6 +459,8 @@ input.rangeInput {
}
}
// FIXME: Translations are still using code.keybinding instead of kbd
kbd,
.keybinding {
background: #fff;
text-transform: uppercase;
@ -486,11 +488,6 @@ input.rangeInput {
height: 1.2rem;
overflow: hidden;
border: 0rem solid $accentColorDark;
.keybinding_space {
font-size: 1.7rem;
line-height: 1.1rem;
margin-top: -1.2rem;
}
}
iframe {

2
src/css/error_handler.scss
View File

@ -84,6 +84,6 @@
display: flex;
padding-top: 1rem;
gap: 1rem;
justify-content: end;
justify-content: flex-end;
}
}

8
src/css/ingame_hud/building_placer.scss
View File

@ -65,7 +65,8 @@
display: flex;
flex-direction: row;
align-items: center;
.keybinding {
kbd {
position: relative;
margin-left: 0.5rem;
}
@ -113,10 +114,11 @@
grid-row: 1 / 2;
@include SuperSmallText;
text-align: right;
.keybinding {
font-weight: bold !important;
.kbd {
position: relative;
}
font-weight: bold !important;
@include DarkThemeOverride {
color: rgba(#fff, 0.5);

2
src/css/ingame_hud/buildings_toolbar.scss
View File

@ -148,7 +148,7 @@
// transform: scale(1.05);
// border-radius: $globalBorderRadius;
.keybinding {
kbd {
color: #111;
}
}

2
src/css/ingame_hud/dialogs.scss
View File

@ -165,6 +165,8 @@
font-weight: bold;
}
// FIXME: Translations are still using code.keybinding instead of kbd
kbd,
.keybinding {
position: relative;
background: #eee;

3
src/css/ingame_hud/waypoints.scss
View File

@ -17,7 +17,8 @@
.desc {
@include SuperSmallText;
color: #babcbf;
.keybinding {
kbd {
position: relative;
}

3
src/css/states/main_menu.scss
View File

@ -658,8 +658,7 @@
img {
transition: opacity 0.12s ease-in-out;
width: 82px * 0.8;
height: 25px * 0.8;
width: 6rem;
filter: invert(100%);
opacity: 0.75;
}

1
src/js/core/modal_dialog_elements.ts
View File

@ -208,7 +208,6 @@ export class Dialog<T extends string = never, U extends unknown[] = []> {
// if (this.app.settings.getShowKeyboardShortcuts()) {
// Show keybinding
const spacer = document.createElement("kbd");
spacer.classList.add("keybinding");
spacer.innerHTML = getStringForKeyCode(isEnter ? kbEnter : kbCancel);
button.appendChild(spacer);
// }

4
src/js/game/hud/parts/building_placer.js
View File

@ -130,7 +130,7 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic {
const binding = this.root.keyMapper.getBinding(rawBinding);
this.buildingInfoElements.hotkey.innerHTML = T.ingame.buildingPlacement.hotkeyLabel.replace(
"<key>",
"<kbd class='keybinding'>" + binding.getKeyCodeString() + "</kbd>"
"<kbd>" + binding.getKeyCodeString() + "</kbd>"
);
} else {
this.buildingInfoElements.hotkey.innerHTML = "";
@ -197,7 +197,7 @@ export class HUDBuildingPlacer extends HUDBuildingPlacerLogic {
["explanation"],
T.ingame.buildingPlacement.cycleBuildingVariants.replace(
"<key>",
"<kbd class='keybinding'>" +
"<kbd>" +
this.root.keyMapper
.getBinding(KEYMAPPINGS.placement.cycleBuildingVariants)
.getKeyCodeString() +

8
src/js/game/hud/parts/keybinding_overlay.js
View File

@ -290,13 +290,13 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
switch (key) {
case KEYCODE_LMB:
html += `<kbd class="keybinding leftMouse"></kbd>`;
html += `<kbd class="leftMouse"></kbd>`;
break;
case KEYCODE_RMB:
html += `<kbd class="keybinding rightMouse"></kbd>`;
html += `<kbd class="rightMouse"></kbd>`;
break;
case KEYCODE_MMB:
html += `<kbd class="keybinding middleMouse"></kbd>`;
html += `<kbd class="middleMouse"></kbd>`;
break;
case DIVIDER_TOKEN:
html += `<i></i>`;
@ -305,7 +305,7 @@ export class HUDKeybindingOverlay extends BaseHUDPart {
html += `+`;
break;
default:
html += `<kbd class="keybinding">${getStringForKeyCode(
html += `<kbd>${getStringForKeyCode(
mapper.getBinding(/** @type {KeyCode} */ (key)).keyCode
)}</kbd>`;
}

2
src/js/game/hud/parts/waypoints.js
View File

@ -53,7 +53,7 @@ export class HUDWaypoints extends BaseHUDPart {
<strong class='title'>${T.ingame.waypoints.waypoints}</strong>
<span class='desc'>${T.ingame.waypoints.description.replace(
"<keybinding>",
`<kbd class='keybinding'>${this.root.keyMapper
`<kbd>${this.root.keyMapper
.getBinding(KEYMAPPINGS.navigation.createMarker)
.getKeyCodeString()}</kbd>`
)}</span>

1
src/js/game/key_action_mapper.js
View File

@ -387,7 +387,6 @@ export class Keybinding {
return null;
}
const spacer = document.createElement("kbd");
spacer.classList.add("keybinding");
spacer.innerHTML = getStringForKeyCode(this.keyCode);
elem.appendChild(spacer);
return spacer;