diff --git a/README.DOCKER.md b/README.DOCKER.md index c3b38224d..dba2e2257 100644 --- a/README.DOCKER.md +++ b/README.DOCKER.md @@ -47,9 +47,7 @@ Make an changes you need to `config/docker.json` then build the image. If it doe "naturalcrit_url" : "local.naturalcrit.com:8010", "secret" : "secret", "web_port" : 8000, -"enable_v3" : true, "mongodb_uri": "mongodb://172.17.0.2/homebrewery", -"enable_themes" : true } ``` diff --git a/client/homebrew/editor/editor.jsx b/client/homebrew/editor/editor.jsx index 8b7f6ccf5..d6fdf3f08 100644 --- a/client/homebrew/editor/editor.jsx +++ b/client/homebrew/editor/editor.jsx @@ -409,7 +409,6 @@ const Editor = createClass({ //Called when there are changes to the editor's dimensions update : function(){ - this.codeEditor.current?.updateSize(); const snipHeight = document.querySelector('.editor > .snippetBar').offsetHeight; if(snipHeight !== this.state.snippetbarHeight) this.setState({ snippetbarHeight: snipHeight }); diff --git a/client/homebrew/editor/metadataEditor/metadataEditor.jsx b/client/homebrew/editor/metadataEditor/metadataEditor.jsx index 8f256922f..338ad9360 100644 --- a/client/homebrew/editor/metadataEditor/metadataEditor.jsx +++ b/client/homebrew/editor/metadataEditor/metadataEditor.jsx @@ -207,8 +207,6 @@ const MetadataEditor = createClass({ }, renderThemeDropdown : function(){ - if(!global.enable_themes) return; - const mergedThemes = _.merge(Themes, this.props.userThemes); const listThemes = (renderer)=>{ @@ -307,8 +305,6 @@ const MetadataEditor = createClass({ }, renderRenderOptions : function(){ - if(!global.enable_v3) return; - return
diff --git a/client/homebrew/homebrew.jsx b/client/homebrew/homebrew.jsx index e7e006808..e38293bde 100644 --- a/client/homebrew/homebrew.jsx +++ b/client/homebrew/homebrew.jsx @@ -27,8 +27,6 @@ const Homebrew = (props)=>{ url = '', version = '0.0.0', account = null, - enable_v3 = false, - enable_themes, config, brew = { title : '', @@ -45,8 +43,6 @@ const Homebrew = (props)=>{ global.account = account; global.version = version; - global.enable_v3 = enable_v3; - global.enable_themes = enable_themes; global.config = config; const backgroundObject = ()=>{ diff --git a/client/homebrew/navbar/navbar.less b/client/homebrew/navbar/navbar.less index aa233d631..7b0217bf8 100644 --- a/client/homebrew/navbar/navbar.less +++ b/client/homebrew/navbar/navbar.less @@ -37,7 +37,10 @@ &:has(.brewTitle) { flex-grow : 1; - min-width : 300px; + min-width : 300px; + } + >.brewTitle { + cursor:auto; } } // "NaturalCrit" logo diff --git a/config/default.json b/config/default.json index 0a2d7281e..6be4ce7ce 100644 --- a/config/default.json +++ b/config/default.json @@ -4,8 +4,6 @@ "naturalcrit_url" : "local.naturalcrit.com:8010", "secret" : "secret", "web_port" : 8000, - "enable_v3" : true, - "enable_themes" : true, "local_environments" : ["docker", "local"], "publicUrl" : "https://homebrewery.naturalcrit.com", "hb_images" : null, diff --git a/package-lock.json b/package-lock.json index ee762f8f7..1e8e72488 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,11 +10,11 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.27.1", - "@babel/plugin-transform-runtime": "^7.28.0", - "@babel/preset-env": "^7.28.0", + "@babel/core": "^7.28.4", + "@babel/plugin-transform-runtime": "^7.28.3", + "@babel/preset-env": "^7.28.3", "@babel/preset-react": "^7.27.1", - "@babel/runtime": "^7.27.6", + "@babel/runtime": "^7.28.4", "@dmsnell/diff-match-patch": "^1.1.0", "@googleapis/drive": "^13.0.1", "@sanity/diff-match-patch": "^3.2.0", @@ -22,7 +22,7 @@ "classnames": "^2.5.1", "codemirror": "^5.65.6", "cookie-parser": "^1.4.7", - "core-js": "^3.44.0", + "core-js": "^3.46.0", "cors": "^2.8.5", "create-react-class": "^15.7.0", "dedent-tabs": "^0.10.3", @@ -31,7 +31,7 @@ "express-async-handler": "^1.2.0", "express-static-gzip": "3.0.0", "fflate": "^0.8.2", - "fs-extra": "11.3.0", + "fs-extra": "11.3.2", "hash-wasm": "^4.12.0", "idb-keyval": "^6.2.2", "js-yaml": "^4.1.0", @@ -46,16 +46,16 @@ "marked-gfm-heading-id": "^4.1.2", "marked-nonbreaking-spaces": "^1.0.1", "marked-smartypants-lite": "^1.0.3", - "marked-subsuper-text": "^1.0.3", + "marked-subsuper-text": "^1.0.4", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.16.3", - "nanoid": "5.1.5", + "mongoose": "^8.19.1", + "nanoid": "5.1.6", "nconf": "^0.13.0", "react": "^18.3.1", "react-dom": "^18.3.1", "react-frame-component": "^4.1.3", - "react-router": "^7.6.3", + "react-router": "^7.9.4", "romans": "^3.1.0", "sanitize-filename": "1.6.3", "superagent": "^10.2.1", @@ -83,19 +83,6 @@ "npm": "^10.8.x" } }, - "node_modules/@ampproject/remapping": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", - "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", - "license": "Apache-2.0", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/@babel/code-frame": { "version": "7.27.1", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", @@ -119,20 +106,21 @@ } }, "node_modules/@babel/core": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz", - "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz", + "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==", + "license": "MIT", "dependencies": { - "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.0", + "@babel/generator": "^7.28.3", "@babel/helper-compilation-targets": "^7.27.2", - "@babel/helper-module-transforms": "^7.27.3", - "@babel/helpers": "^7.27.6", - "@babel/parser": "^7.28.0", + "@babel/helper-module-transforms": "^7.28.3", + "@babel/helpers": "^7.28.4", + "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", - "@babel/traverse": "^7.28.0", - "@babel/types": "^7.28.0", + "@babel/traverse": "^7.28.4", + "@babel/types": "^7.28.4", + "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -148,12 +136,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz", - "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz", + "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==", + "license": "MIT", "dependencies": { - "@babel/parser": "^7.28.0", - "@babel/types": "^7.28.0", + "@babel/parser": "^7.28.3", + "@babel/types": "^7.28.2", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -190,17 +179,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.1.tgz", - "integrity": "sha512-QwGAmuvM17btKU5VqXfb+Giw4JcN0hjuufz3DYnpeVDvZLAObloM77bhMXiqry3Iio+Ai4phVRDwl6WU10+r5A==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.3.tgz", + "integrity": "sha512-V9f6ZFIYSLNEbuGA/92uOvYsGCJNsuA8ESZ4ldc09bWk/j8H8TKiPw8Mk1eG6olpnO0ALHJmYfZvF4MEE4gajg==", "license": "MIT", "dependencies": { - "@babel/helper-annotate-as-pure": "^7.27.1", + "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-member-expression-to-functions": "^7.27.1", "@babel/helper-optimise-call-expression": "^7.27.1", "@babel/helper-replace-supers": "^7.27.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.27.1", - "@babel/traverse": "^7.27.1", + "@babel/traverse": "^7.28.3", "semver": "^6.3.1" }, "engines": { @@ -277,13 +266,14 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz", - "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", + "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.27.1", "@babel/helper-validator-identifier": "^7.27.1", - "@babel/traverse": "^7.27.3" + "@babel/traverse": "^7.28.3" }, "engines": { "node": ">=6.9.0" @@ -402,23 +392,25 @@ } }, "node_modules/@babel/helpers": { - "version": "7.27.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz", - "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz", + "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==", + "license": "MIT", "dependencies": { "@babel/template": "^7.27.2", - "@babel/types": "^7.27.6" + "@babel/types": "^7.28.4" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz", - "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz", + "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==", + "license": "MIT", "dependencies": { - "@babel/types": "^7.28.0" + "@babel/types": "^7.28.4" }, "bin": { "parser": "bin/babel-parser.js" @@ -491,13 +483,13 @@ } }, "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.27.1.tgz", - "integrity": "sha512-6BpaYGDavZqkI6yT+KSPdpZFfpnd68UKXbcjI9pJ13pvHhPrCKWOOLp+ysvMeA+DxnhuPpgIaRpxRxo5A9t5jw==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.28.3.tgz", + "integrity": "sha512-b6YTX108evsvE4YgWyQ921ZAFFQm3Bn+CA3+ZXlNVnPhx+UfsVURoPjfGAPCjBgrqo30yX/C2nZGX96DxvR9Iw==", "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1", - "@babel/traverse": "^7.27.1" + "@babel/traverse": "^7.28.3" }, "engines": { "node": ">=6.9.0" @@ -880,12 +872,12 @@ } }, "node_modules/@babel/plugin-transform-class-static-block": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.27.1.tgz", - "integrity": "sha512-s734HmYU78MVzZ++joYM+NkJusItbdRcbm+AGRgJCt3iA+yux0QpD9cBVdz3tKyrjVYWRl7j0mHSmv4lhV0aoA==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.28.3.tgz", + "integrity": "sha512-LtPXlBbRoc4Njl/oh1CeD/3jC+atytbnf/UqLoqTDcEYGUPj022+rvfkbDYieUrSj3CaV4yHDByPE+T2HwfsJg==", "license": "MIT", "dependencies": { - "@babel/helper-create-class-features-plugin": "^7.27.1", + "@babel/helper-create-class-features-plugin": "^7.28.3", "@babel/helper-plugin-utils": "^7.27.1" }, "engines": { @@ -896,16 +888,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.0.tgz", - "integrity": "sha512-IjM1IoJNw72AZFlj33Cu8X0q2XK/6AaVC3jQu+cgQ5lThWD5ajnuUAml80dqRmOhmPkTH8uAwnpMu9Rvj0LTRA==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.28.4.tgz", + "integrity": "sha512-cFOlhIYPBv/iBoc+KS3M6et2XPtbT2HiCRfBXWtfpc9OAyostldxIf9YAYB6ypURBBbx+Qv6nyrLzASfJe+hBA==", + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.27.3", "@babel/helper-compilation-targets": "^7.27.2", "@babel/helper-globals": "^7.28.0", "@babel/helper-plugin-utils": "^7.27.1", "@babel/helper-replace-supers": "^7.27.1", - "@babel/traverse": "^7.28.0" + "@babel/traverse": "^7.28.4" }, "engines": { "node": ">=6.9.0" @@ -1465,9 +1458,10 @@ } }, "node_modules/@babel/plugin-transform-regenerator": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.0.tgz", - "integrity": "sha512-LOAozRVbqxEVjSKfhGnuLoE4Kz4Oc5UJzuvFUhSsQzdCdaAQu06mG8zDv2GFSerM62nImUZ7K92vxnQcLSDlCQ==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.28.4.tgz", + "integrity": "sha512-+ZEdQlBoRg9m2NnzvEeLgtvBMO4tkFBw5SQIUgLICgTrumLoU7lr+Oghi6km2PFj+dbUt2u1oby2w3BDO9YQnA==", + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.27.1" }, @@ -1510,9 +1504,10 @@ } }, "node_modules/@babel/plugin-transform-runtime": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.0.tgz", - "integrity": "sha512-dGopk9nZrtCs2+nfIem25UuHyt5moSJamArzIoh9/vezUQPmYDOzjaHDCkAzuGJibCIkPup8rMT2+wYB6S73cA==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.28.3.tgz", + "integrity": "sha512-Y6ab1kGqZ0u42Zv/4a7l0l72n9DKP/MKoKWaUSBylrhNZO2prYuqFOLbn5aW5SIFXwSH93yfjbgllL8lxuGKLg==", + "license": "MIT", "dependencies": { "@babel/helper-module-imports": "^7.27.1", "@babel/helper-plugin-utils": "^7.27.1", @@ -1668,9 +1663,10 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.0.tgz", - "integrity": "sha512-VmaxeGOwuDqzLl5JUkIRM1X2Qu2uKGxHEQWh+cvvbl7JuJRgKGJSfsEF/bUaxFhJl/XAyxBe7q7qSuTbKFuCyg==", + "version": "7.28.3", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.28.3.tgz", + "integrity": "sha512-ROiDcM+GbYVPYBOeCR6uBXKkQpBExLl8k9HO1ygXEyds39j+vCCsjmj7S8GOniZQlEs81QlkdJZe76IpLSiqpg==", + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.28.0", "@babel/helper-compilation-targets": "^7.27.2", @@ -1680,7 +1676,7 @@ "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.27.1", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.27.1", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.27.1", - "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.27.1", + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.28.3", "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2", "@babel/plugin-syntax-import-assertions": "^7.27.1", "@babel/plugin-syntax-import-attributes": "^7.27.1", @@ -1691,8 +1687,8 @@ "@babel/plugin-transform-block-scoped-functions": "^7.27.1", "@babel/plugin-transform-block-scoping": "^7.28.0", "@babel/plugin-transform-class-properties": "^7.27.1", - "@babel/plugin-transform-class-static-block": "^7.27.1", - "@babel/plugin-transform-classes": "^7.28.0", + "@babel/plugin-transform-class-static-block": "^7.28.3", + "@babel/plugin-transform-classes": "^7.28.3", "@babel/plugin-transform-computed-properties": "^7.27.1", "@babel/plugin-transform-destructuring": "^7.28.0", "@babel/plugin-transform-dotall-regex": "^7.27.1", @@ -1724,7 +1720,7 @@ "@babel/plugin-transform-private-methods": "^7.27.1", "@babel/plugin-transform-private-property-in-object": "^7.27.1", "@babel/plugin-transform-property-literals": "^7.27.1", - "@babel/plugin-transform-regenerator": "^7.28.0", + "@babel/plugin-transform-regenerator": "^7.28.3", "@babel/plugin-transform-regexp-modifiers": "^7.27.1", "@babel/plugin-transform-reserved-words": "^7.27.1", "@babel/plugin-transform-shorthand-properties": "^7.27.1", @@ -1785,9 +1781,10 @@ } }, "node_modules/@babel/runtime": { - "version": "7.27.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz", - "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz", + "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==", + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -1807,16 +1804,17 @@ } }, "node_modules/@babel/traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz", - "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz", + "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==", + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.27.1", - "@babel/generator": "^7.28.0", + "@babel/generator": "^7.28.3", "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.28.0", + "@babel/parser": "^7.28.4", "@babel/template": "^7.27.2", - "@babel/types": "^7.28.0", + "@babel/types": "^7.28.4", "debug": "^4.3.1" }, "engines": { @@ -1824,9 +1822,9 @@ } }, "node_modules/@babel/types": { - "version": "7.28.2", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz", - "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==", + "version": "7.28.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz", + "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -2816,6 +2814,16 @@ "@jridgewell/trace-mapping": "^0.3.24" } }, + "node_modules/@jridgewell/remapping": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", + "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", + "license": "MIT", + "dependencies": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", @@ -2848,9 +2856,10 @@ "license": "MIT" }, "node_modules/@mongodb-js/saslprep": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz", - "integrity": "sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.3.1.tgz", + "integrity": "sha512-6nZrq5kfAz0POWyhljnbWQQJQ5uT8oE2ddX303q1uY0tWsivWKgBDXBBvuFPwOqRRalXJuVO9EjOdVtuhLX0zg==", + "license": "MIT", "dependencies": { "sparse-bitfield": "^3.0.3" } @@ -3133,12 +3142,14 @@ "node_modules/@types/webidl-conversions": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/@types/webidl-conversions/-/webidl-conversions-7.0.3.tgz", - "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==" + "integrity": "sha512-CiJJvcRtIgzadHCYXw7dqEnMNRjhGZlYK05Mj9OyktqV8uVT8fD2BFOB7S1uwBE3Kj2Z+4UyPmFw/Ixgw/LAlA==", + "license": "MIT" }, "node_modules/@types/whatwg-url": { "version": "11.0.5", "resolved": "https://registry.npmjs.org/@types/whatwg-url/-/whatwg-url-11.0.5.tgz", "integrity": "sha512-coYR071JRaHa+xoEvvYqvnIHaVqaYrLPbsufM9BF63HkwI5Lgmy2QR8Q5K/lYDYo5AK82wOvSOS0UsLTpTG7uQ==", + "license": "MIT", "dependencies": { "@types/webidl-conversions": "*" } @@ -4592,6 +4603,7 @@ "version": "6.10.4", "resolved": "https://registry.npmjs.org/bson/-/bson-6.10.4.tgz", "integrity": "sha512-WIsKqkSC0ABoBJuT1LEX+2HEvNmNKKgnTAyd0fL8qzK4SH2i9NXg+t08YtdZp/V9IZ33cxe3iV4yM0qg8lMQng==", + "license": "Apache-2.0", "engines": { "node": ">=16.20.1" } @@ -5149,9 +5161,9 @@ } }, "node_modules/core-js": { - "version": "3.44.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.44.0.tgz", - "integrity": "sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==", + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.46.0.tgz", + "integrity": "sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==", "hasInstallScript": true, "license": "MIT", "funding": { @@ -6982,9 +6994,9 @@ } }, "node_modules/fs-extra": { - "version": "11.3.0", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz", - "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", @@ -9979,12 +9991,12 @@ } }, "node_modules/marked-subsuper-text": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/marked-subsuper-text/-/marked-subsuper-text-1.0.3.tgz", - "integrity": "sha512-v5hVVJo6L7HQtplIT8OYNbRWMCGupXYuZ7U9qTsC4yLDtfw24oM5xmWVYfzqzX6hD7KneMfDssMPt6U7fslbxQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/marked-subsuper-text/-/marked-subsuper-text-1.0.4.tgz", + "integrity": "sha512-sSNZpQZUNyV6j6i40Sip207ywbvMwoTY8md94t+snBGMahhOz9QiAke738dJCz+um3d4QkpGBI21ke17c56fUQ==", "license": "MIT", "peerDependencies": { - "marked": ">=3 <16" + "marked": ">=3 <17" } }, "node_modules/markedLegacy": { @@ -10050,7 +10062,8 @@ "node_modules/memory-pager": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/memory-pager/-/memory-pager-1.5.0.tgz", - "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==" + "integrity": "sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==", + "license": "MIT" }, "node_modules/meow": { "version": "13.2.0", @@ -10317,6 +10330,7 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.2.tgz", "integrity": "sha512-rMO7CGo/9BFwyZABcKAWL8UJwH/Kc2x0g72uhDWzG48URRax5TCIcJ7Rc3RZqffZzO/Gwff/jyKwCU9TN8gehA==", + "license": "Apache-2.0", "dependencies": { "@types/whatwg-url": "^11.0.2", "whatwg-url": "^14.1.0 || ^13.0.0" @@ -10326,6 +10340,7 @@ "version": "5.1.1", "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.1.1.tgz", "integrity": "sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==", + "license": "MIT", "dependencies": { "punycode": "^2.3.1" }, @@ -10337,6 +10352,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", + "license": "BSD-2-Clause", "engines": { "node": ">=12" } @@ -10345,6 +10361,7 @@ "version": "14.2.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.2.0.tgz", "integrity": "sha512-De72GdQZzNTUBBChsXueQUnPKDkg/5A5zp7pFDuQAj5UFoENpiACU0wlCvzpAGnTkj++ihpKwKyYewn/XNUbKw==", + "license": "MIT", "dependencies": { "tr46": "^5.1.0", "webidl-conversions": "^7.0.0" @@ -10354,14 +10371,14 @@ } }, "node_modules/mongoose": { - "version": "8.16.3", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.16.3.tgz", - "integrity": "sha512-p2JOsRQG7j0vXhLpsWw5Slm2VnDeJK8sRyqSyegk5jQujuP9BTOZ1Di9VX/0lYfBhZ2DpAExi51QTd4pIqSgig==", + "version": "8.19.1", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-8.19.1.tgz", + "integrity": "sha512-oB7hGQJn4f8aebqE7mhE54EReb5cxVgpCxQCQj0K/cK3q4J3Tg08nFP6sM52nJ4Hlm8jsDnhVYpqIITZUAhckQ==", "license": "MIT", "dependencies": { "bson": "^6.10.4", "kareem": "2.6.3", - "mongodb": "~6.17.0", + "mongodb": "~6.20.0", "mpath": "0.9.0", "mquery": "5.0.0", "ms": "2.1.3", @@ -10379,6 +10396,7 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", "optional": true, "peer": true, "dependencies": { @@ -10392,6 +10410,7 @@ "version": "5.1.3", "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-5.1.3.tgz", "integrity": "sha512-95hVgBRgEIRQQQHIbnxBXeHbW4TqFk4ZDJW7wmVtvYar72FdhRIo1UGOLS2eRAKCPEdPBWu+M7+A33D9CdX9rA==", + "license": "Apache-2.0", "optional": true, "peer": true, "dependencies": { @@ -10408,6 +10427,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-5.3.0.tgz", "integrity": "sha512-FNTkdNEnBdlqF2oatizolQqNANMrcqJt6AAYt99B3y1aLLC8Hc5IOBb+ZnnzllodEEf6xMBp6wRcBbc16fa65w==", + "license": "Apache-2.0", "optional": true, "peer": true, "dependencies": { @@ -10422,6 +10442,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", "optional": true, "peer": true, "dependencies": { @@ -10433,13 +10454,14 @@ } }, "node_modules/mongoose/node_modules/mongodb": { - "version": "6.17.0", - "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.17.0.tgz", - "integrity": "sha512-neerUzg/8U26cgruLysKEjJvoNSXhyID3RvzvdcpsIi2COYM3FS3o9nlH7fxFtefTb942dX3W9i37oPfCVj4wA==", + "version": "6.20.0", + "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-6.20.0.tgz", + "integrity": "sha512-Tl6MEIU3K4Rq3TSHd+sZQqRBoGlFsOgNrH5ltAcFBV62Re3Fd+FcaVf8uSEQFOJ51SDowDVttBTONMfoYWrWlQ==", + "license": "Apache-2.0", "dependencies": { - "@mongodb-js/saslprep": "^1.1.9", + "@mongodb-js/saslprep": "^1.3.0", "bson": "^6.10.4", - "mongodb-connection-string-url": "^3.0.0" + "mongodb-connection-string-url": "^3.0.2" }, "engines": { "node": ">=16.20.1" @@ -10450,7 +10472,7 @@ "gcp-metadata": "^5.2.0", "kerberos": "^2.0.1", "mongodb-client-encryption": ">=6.0.0 <7", - "snappy": "^7.2.2", + "snappy": "^7.3.2", "socks": "^2.7.1" }, "peerDependenciesMeta": { @@ -10511,9 +10533,9 @@ "optional": true }, "node_modules/nanoid": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz", - "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz", + "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==", "funding": [ { "type": "github", @@ -11873,9 +11895,10 @@ "license": "MIT" }, "node_modules/react-router": { - "version": "7.6.3", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.6.3.tgz", - "integrity": "sha512-zf45LZp5skDC6I3jDLXQUu0u26jtuP4lEGbc7BbdyxenBN1vJSTA18czM2D+h5qyMBuMrD+9uB+mU37HIoKGRA==", + "version": "7.9.4", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.4.tgz", + "integrity": "sha512-SD3G8HKviFHg9xj7dNODUKDFgpG4xqD5nhyd0mYoB5iISepuZAvzSr8ywxgxKJ52yRzf/HWtVHc9AWwoTbljvA==", + "license": "MIT", "dependencies": { "cookie": "^1.0.1", "set-cookie-parser": "^2.6.0" @@ -12924,6 +12947,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/sparse-bitfield/-/sparse-bitfield-3.0.3.tgz", "integrity": "sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==", + "license": "MIT", "dependencies": { "memory-pager": "^1.0.2" } diff --git a/package.json b/package.json index c897d842d..9b31a50f9 100644 --- a/package.json +++ b/package.json @@ -83,11 +83,11 @@ ] }, "dependencies": { - "@babel/core": "^7.27.1", - "@babel/plugin-transform-runtime": "^7.28.0", - "@babel/preset-env": "^7.28.0", + "@babel/core": "^7.28.4", + "@babel/plugin-transform-runtime": "^7.28.3", + "@babel/preset-env": "^7.28.3", "@babel/preset-react": "^7.27.1", - "@babel/runtime": "^7.27.6", + "@babel/runtime": "^7.28.4", "@dmsnell/diff-match-patch": "^1.1.0", "@googleapis/drive": "^13.0.1", "@sanity/diff-match-patch": "^3.2.0", @@ -95,7 +95,7 @@ "classnames": "^2.5.1", "codemirror": "^5.65.6", "cookie-parser": "^1.4.7", - "core-js": "^3.44.0", + "core-js": "^3.46.0", "cors": "^2.8.5", "create-react-class": "^15.7.0", "dedent-tabs": "^0.10.3", @@ -104,7 +104,7 @@ "express-async-handler": "^1.2.0", "express-static-gzip": "3.0.0", "fflate": "^0.8.2", - "fs-extra": "11.3.0", + "fs-extra": "11.3.2", "hash-wasm": "^4.12.0", "idb-keyval": "^6.2.2", "js-yaml": "^4.1.0", @@ -119,16 +119,16 @@ "marked-gfm-heading-id": "^4.1.2", "marked-nonbreaking-spaces": "^1.0.1", "marked-smartypants-lite": "^1.0.3", - "marked-subsuper-text": "^1.0.3", + "marked-subsuper-text": "^1.0.4", "markedLegacy": "npm:marked@^0.3.19", "moment": "^2.30.1", - "mongoose": "^8.16.3", - "nanoid": "5.1.5", + "mongoose": "^8.19.1", + "nanoid": "5.1.6", "nconf": "^0.13.0", "react": "^18.3.1", "react-dom": "^18.3.1", "react-frame-component": "^4.1.3", - "react-router": "^7.6.3", + "react-router": "^7.9.4", "romans": "^3.1.0", "sanitize-filename": "1.6.3", "superagent": "^10.2.1", diff --git a/server/app.js b/server/app.js index 673d70c68..1bdb5aac3 100644 --- a/server/app.js +++ b/server/app.js @@ -563,8 +563,6 @@ const renderPage = async (req, res)=>{ brews : req.brews, googleBrews : req.googleBrews, account : req.account, - enable_v3 : config.get('enable_v3'), - enable_themes : config.get('enable_themes'), config : configuration, ogMeta : req.ogMeta, userThemes : req.userThemes diff --git a/shared/naturalcrit/codeEditor/codeEditor.less b/shared/naturalcrit/codeEditor/codeEditor.less index 2a57ae8e6..c8e60974b 100644 --- a/shared/naturalcrit/codeEditor/codeEditor.less +++ b/shared/naturalcrit/codeEditor/codeEditor.less @@ -38,6 +38,11 @@ animation-duration : 0.4s; } + .CodeMirror-search-field { + width:25em !important; + outline:1px inset #00000055 !important; + } + //.cm-tab { // background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAMCAQAAACOs/baAAAARUlEQVR4nGJgIAG8JkXxUAcCtDWemcGR1lY4MvgzCEKY7jSBjgxBDAG09UEQzAe0AMwMHrSOAwEGRtpaMIwAAAAA//8DAG4ID9EKs6YqAAAAAElFTkSuQmCC) no-repeat right; //} diff --git a/themes/fonts/iconFonts/diceFont.js b/themes/fonts/iconFonts/diceFont.js index a349d7b0a..65b56a62a 100644 --- a/themes/fonts/iconFonts/diceFont.js +++ b/themes/fonts/iconFonts/diceFont.js @@ -14,6 +14,7 @@ const diceFont = { 'df_d10_7' : 'df d10-7', 'df_d10_8' : 'df d10-8', 'df_d10_9' : 'df d10-9', + 'df_d10_0' : 'df d10-0', 'df_d12' : 'df d12', 'df_d12_1' : 'df d12-1', 'df_d12_10' : 'df d12-10', @@ -90,7 +91,108 @@ const diceFont = { 'df_solid_small_dot_d6_3' : 'df solid-small-dot-d6-3', 'df_solid_small_dot_d6_4' : 'df solid-small-dot-d6-4', 'df_solid_small_dot_d6_5' : 'df solid-small-dot-d6-5', - 'df_solid_small_dot_d6_6' : 'df solid-small-dot-d6-6' + 'df_solid_small_dot_d6_6' : 'df solid-small-dot-d6-6', + 'df_d10_00' : 'df d10-00', + 'df_d10_01' : 'df d10-01', + 'df_d10_02' : 'df d10-02', + 'df_d10_03' : 'df d10-03', + 'df_d10_04' : 'df d10-04', + 'df_d10_05' : 'df d10-05', + 'df_d10_06' : 'df d10-06', + 'df_d10_07' : 'df d10-07', + 'df_d10_08' : 'df d10-08', + 'df_d10_09' : 'df d10-09', + 'df_d10_10' : 'df d10-10', + 'df_d10_11' : 'df d10-11', + 'df_d10_12' : 'df d10-12', + 'df_d10_13' : 'df d10-13', + 'df_d10_14' : 'df d10-14', + 'df_d10_15' : 'df d10-15', + 'df_d10_16' : 'df d10-16', + 'df_d10_17' : 'df d10-17', + 'df_d10_18' : 'df d10-18', + 'df_d10_19' : 'df d10-19', + 'df_d10_20' : 'df d10-20', + 'df_d10_21' : 'df d10-21', + 'df_d10_22' : 'df d10-22', + 'df_d10_23' : 'df d10-23', + 'df_d10_24' : 'df d10-24', + 'df_d10_25' : 'df d10-25', + 'df_d10_26' : 'df d10-26', + 'df_d10_27' : 'df d10-27', + 'df_d10_28' : 'df d10-28', + 'df_d10_29' : 'df d10-29', + 'df_d10_30' : 'df d10-30', + 'df_d10_31' : 'df d10-31', + 'df_d10_32' : 'df d10-32', + 'df_d10_33' : 'df d10-33', + 'df_d10_34' : 'df d10-34', + 'df_d10_35' : 'df d10-35', + 'df_d10_36' : 'df d10-36', + 'df_d10_37' : 'df d10-37', + 'df_d10_38' : 'df d10-38', + 'df_d10_39' : 'df d10-39', + 'df_d10_40' : 'df d10-40', + 'df_d10_41' : 'df d10-41', + 'df_d10_42' : 'df d10-42', + 'df_d10_43' : 'df d10-43', + 'df_d10_44' : 'df d10-44', + 'df_d10_45' : 'df d10-45', + 'df_d10_46' : 'df d10-46', + 'df_d10_47' : 'df d10-47', + 'df_d10_48' : 'df d10-48', + 'df_d10_49' : 'df d10-49', + 'df_d10_50' : 'df d10-50', + 'df_d10_51' : 'df d10-51', + 'df_d10_52' : 'df d10-52', + 'df_d10_53' : 'df d10-53', + 'df_d10_54' : 'df d10-54', + 'df_d10_55' : 'df d10-55', + 'df_d10_56' : 'df d10-56', + 'df_d10_57' : 'df d10-57', + 'df_d10_58' : 'df d10-58', + 'df_d10_59' : 'df d10-59', + 'df_d10_60' : 'df d10-60', + 'df_d10_61' : 'df d10-61', + 'df_d10_62' : 'df d10-62', + 'df_d10_63' : 'df d10-63', + 'df_d10_64' : 'df d10-64', + 'df_d10_65' : 'df d10-65', + 'df_d10_66' : 'df d10-66', + 'df_d10_67' : 'df d10-67', + 'df_d10_68' : 'df d10-68', + 'df_d10_69' : 'df d10-69', + 'df_d10_70' : 'df d10-70', + 'df_d10_71' : 'df d10-71', + 'df_d10_72' : 'df d10-72', + 'df_d10_73' : 'df d10-73', + 'df_d10_74' : 'df d10-74', + 'df_d10_75' : 'df d10-75', + 'df_d10_76' : 'df d10-76', + 'df_d10_77' : 'df d10-77', + 'df_d10_78' : 'df d10-78', + 'df_d10_79' : 'df d10-79', + 'df_d10_80' : 'df d10-80', + 'df_d10_81' : 'df d10-81', + 'df_d10_82' : 'df d10-82', + 'df_d10_83' : 'df d10-83', + 'df_d10_84' : 'df d10-84', + 'df_d10_85' : 'df d10-85', + 'df_d10_86' : 'df d10-86', + 'df_d10_87' : 'df d10-87', + 'df_d10_88' : 'df d10-88', + 'df_d10_89' : 'df d10-89', + 'df_d10_90' : 'df d10-90', + 'df_d10_91' : 'df d10-91', + 'df_d10_92' : 'df d10-92', + 'df_d10_93' : 'df d10-93', + 'df_d10_94' : 'df d10-94', + 'df_d10_95' : 'df d10-95', + 'df_d10_96' : 'df d10-96', + 'df_d10_97' : 'df d10-97', + 'df_d10_98' : 'df d10-98', + 'df_d10_99' : 'df d10-99', + 'df_d10_100' : 'df d10-100' }; export default diceFont; \ No newline at end of file diff --git a/themes/fonts/iconFonts/diceFont.less b/themes/fonts/iconFonts/diceFont.less index 3b60093d0..a49be2da3 100644 --- a/themes/fonts/iconFonts/diceFont.less +++ b/themes/fonts/iconFonts/diceFont.less @@ -6,6 +6,14 @@ src : url('../../../fonts/iconFonts/diceFont.woff2'); } +@font-face { + font-family : 'DiceFontD100'; + src : url('../../../fonts/iconFonts/diceFontD100.woff2') format('woff2'); + font-weight : normal; + font-style : normal; + font-display : block; + } + .df { display : inline; font-family : 'DiceFont'; @@ -26,17 +34,6 @@ &.F-plus::before { content : '\f192'; } &.F-zero::before { content : '\f193'; } &.d10::before { content : '\f194'; } - &.d10-0::before { content : '\f100'; } - &.d10-1::before { content : '\f101'; } - &.d10-10::before { content : '\f102'; } - &.d10-2::before { content : '\f103'; } - &.d10-3::before { content : '\f104'; } - &.d10-4::before { content : '\f105'; } - &.d10-5::before { content : '\f106'; } - &.d10-6::before { content : '\f107'; } - &.d10-7::before { content : '\f108'; } - &.d10-8::before { content : '\f109'; } - &.d10-9::before { content : '\f10a'; } &.d12::before { content : '\f195'; } &.d12-1::before { content : '\f10b'; } &.d12-10::before { content : '\f10c'; } @@ -114,4 +111,568 @@ &.solid-small-dot-d6-4::before { content : '\f18c'; } &.solid-small-dot-d6-5::before { content : '\f18d'; } &.solid-small-dot-d6-6::before { content : '\f18e'; } + + // Replacement d10 + + &.d10-0::before { + font-family : 'DiceFontD100'; + content : '\e900'; + } + + &.d10-1::before { + font-family : 'DiceFontD100'; + content : '\e901'; + } + + &.d10-2::before { + font-family : 'DiceFontD100'; + content : '\e902'; + } + + &.d10-3::before { + font-family : 'DiceFontD100'; + content : '\e903'; + } + + &.d10-4::before { + font-family : 'DiceFontD100'; + content : '\e904'; + } + + &.d10-5::before { + font-family : 'DiceFontD100'; + content : '\e905'; + } + + &.d10-6::before { + font-family : 'DiceFontD100'; + content : '\e906'; + } + + &.d10-7::before { + font-family : 'DiceFontD100'; + content : '\e907'; + } + + &.d10-8::before { + font-family : 'DiceFontD100'; + content : '\e908'; + } + + &.d10-9::before { + font-family : 'DiceFontD100'; + content : '\e909'; + } + + &.d10-10::before { + font-family : 'DiceFontD100'; + content : '\e90a'; + } + + // d100 + + &.d10-00::before { + font-family : 'DiceFontD100'; + content : '\e90b'; + } + + &.d10-01::before { + font-family : 'DiceFontD100'; + content : '\e90c'; + } + + &.d10-02::before { + font-family : 'DiceFontD100'; + content : '\e90d'; + } + + &.d10-03::before { + font-family : 'DiceFontD100'; + content : '\e90e'; + } + + &.d10-04::before { + font-family : 'DiceFontD100'; + content : '\e90f'; + } + + &.d10-05::before { + font-family : 'DiceFontD100'; + content : '\e910'; + } + + &.d10-06::before { + font-family : 'DiceFontD100'; + content : '\e911'; + } + + &.d10-07::before { + font-family : 'DiceFontD100'; + content : '\e912'; + } + + &.d10-08::before { + font-family : 'DiceFontD100'; + content : '\e913'; + } + + &.d10-09::before { + font-family : 'DiceFontD100'; + content : '\e914'; + } + + &.d10-10::before { + font-family : 'DiceFontD100'; + content : '\e915'; + } + + &.d10-11::before { + font-family : 'DiceFontD100'; + content : '\e916'; + } + + &.d10-12::before { + font-family : 'DiceFontD100'; + content : '\e917'; + } + + &.d10-13::before { + font-family : 'DiceFontD100'; + content : '\e918'; + } + + &.d10-14::before { + font-family : 'DiceFontD100'; + content : '\e919'; + } + + &.d10-15::before { + font-family : 'DiceFontD100'; + content : '\e91a'; + } + + &.d10-16::before { + font-family : 'DiceFontD100'; + content : '\e91b'; + } + + &.d10-17::before { + font-family : 'DiceFontD100'; + content : '\e91c'; + } + + &.d10-18::before { + font-family : 'DiceFontD100'; + content : '\e91d'; + } + + &.d10-19::before { + font-family : 'DiceFontD100'; + content : '\e91e'; + } + + &.d10-20::before { + font-family : 'DiceFontD100'; + content : '\e91f'; + } + + &.d10-21::before { + font-family : 'DiceFontD100'; + content : '\e920'; + } + + &.d10-22::before { + font-family : 'DiceFontD100'; + content : '\e921'; + } + + &.d10-23::before { + font-family : 'DiceFontD100'; + content : '\e922'; + } + + &.d10-24::before { + font-family : 'DiceFontD100'; + content : '\e923'; + } + + &.d10-25::before { + font-family : 'DiceFontD100'; + content : '\e924'; + } + + &.d10-26::before { + font-family : 'DiceFontD100'; + content : '\e925'; + } + + &.d10-27::before { + font-family : 'DiceFontD100'; + content : '\e926'; + } + + &.d10-28::before { + font-family : 'DiceFontD100'; + content : '\e927'; + } + + &.d10-29::before { + font-family : 'DiceFontD100'; + content : '\e928'; + } + + &.d10-30::before { + font-family : 'DiceFontD100'; + content : '\e929'; + } + + &.d10-31::before { + font-family : 'DiceFontD100'; + content : '\e92a'; + } + + &.d10-32::before { + font-family : 'DiceFontD100'; + content : '\e92b'; + } + + &.d10-33::before { + font-family : 'DiceFontD100'; + content : '\e92c'; + } + + &.d10-34::before { + font-family : 'DiceFontD100'; + content : '\e92d'; + } + + &.d10-35::before { + font-family : 'DiceFontD100'; + content : '\e92e'; + } + + &.d10-36::before { + font-family : 'DiceFontD100'; + content : '\e92f'; + } + + &.d10-37::before { + font-family : 'DiceFontD100'; + content : '\e930'; + } + + &.d10-38::before { + font-family : 'DiceFontD100'; + content : '\e931'; + } + + &.d10-39::before { + font-family : 'DiceFontD100'; + content : '\e932'; + } + + &.d10-40::before { + font-family : 'DiceFontD100'; + content : '\e933'; + } + + &.d10-41::before { + font-family : 'DiceFontD100'; + content : '\e934'; + } + + &.d10-42::before { + font-family : 'DiceFontD100'; + content : '\e935'; + } + + &.d10-43::before { + font-family : 'DiceFontD100'; + content : '\e936'; + } + + &.d10-44::before { + font-family : 'DiceFontD100'; + content : '\e937'; + } + + &.d10-45::before { + font-family : 'DiceFontD100'; + content : '\e938'; + } + + &.d10-46::before { + font-family : 'DiceFontD100'; + content : '\e939'; + } + + &.d10-47::before { + font-family : 'DiceFontD100'; + content : '\e93a'; + } + + &.d10-48::before { + font-family : 'DiceFontD100'; + content : '\e93b'; + } + + &.d10-49::before { + font-family : 'DiceFontD100'; + content : '\e93c'; + } + + &.d10-50::before { + font-family : 'DiceFontD100'; + content : '\e93d'; + } + + &.d10-51::before { + font-family : 'DiceFontD100'; + content : '\e93e'; + } + + &.d10-52::before { + font-family : 'DiceFontD100'; + content : '\e93f'; + } + + &.d10-53::before { + font-family : 'DiceFontD100'; + content : '\e940'; + } + + &.d10-54::before { + font-family : 'DiceFontD100'; + content : '\e941'; + } + + &.d10-55::before { + font-family : 'DiceFontD100'; + content : '\e942'; + } + + &.d10-56::before { + font-family : 'DiceFontD100'; + content : '\e943'; + } + + &.d10-57::before { + font-family : 'DiceFontD100'; + content : '\e944'; + } + + &.d10-58::before { + font-family : 'DiceFontD100'; + content : '\e945'; + } + + &.d10-59::before { + font-family : 'DiceFontD100'; + content : '\e946'; + } + + &.d10-60::before { + font-family : 'DiceFontD100'; + content : '\e947'; + } + + &.d10-61::before { + font-family : 'DiceFontD100'; + content : '\e948'; + } + + &.d10-62::before { + font-family : 'DiceFontD100'; + content : '\e949'; + } + + &.d10-63::before { + font-family : 'DiceFontD100'; + content : '\e94a'; + } + + &.d10-64::before { + font-family : 'DiceFontD100'; + content : '\e94b'; + } + + &.d10-65::before { + font-family : 'DiceFontD100'; + content : '\e94c'; + } + + &.d10-66::before { + font-family : 'DiceFontD100'; + content : '\e94d'; + } + + &.d10-67::before { + font-family : 'DiceFontD100'; + content : '\e94e'; + } + + &.d10-68::before { + font-family : 'DiceFontD100'; + content : '\e94f'; + } + + &.d10-69::before { + font-family : 'DiceFontD100'; + content : '\e950'; + } + + &.d10-70::before { + font-family : 'DiceFontD100'; + content : '\e951'; + } + + &.d10-71::before { + font-family : 'DiceFontD100'; + content : '\e952'; + } + + &.d10-72::before { + font-family : 'DiceFontD100'; + content : '\e953'; + } + + &.d10-73::before { + font-family : 'DiceFontD100'; + content : '\e954'; + } + + &.d10-74::before { + font-family : 'DiceFontD100'; + content : '\e955'; + } + + &.d10-75::before { + font-family : 'DiceFontD100'; + content : '\e956'; + } + + &.d10-76::before { + font-family : 'DiceFontD100'; + content : '\e957'; + } + + &.d10-77::before { + font-family : 'DiceFontD100'; + content : '\e958'; + } + + &.d10-78::before { + font-family : 'DiceFontD100'; + content : '\e959'; + } + + &.d10-79::before { + font-family : 'DiceFontD100'; + content : '\e95a'; + } + + &.d10-80::before { + font-family : 'DiceFontD100'; + content : '\e95b'; + } + + &.d10-81::before { + font-family : 'DiceFontD100'; + content : '\e95c'; + } + + &.d10-82::before { + font-family : 'DiceFontD100'; + content : '\e95d'; + } + + &.d10-83::before { + font-family : 'DiceFontD100'; + content : '\e95e'; + } + + &.d10-84::before { + font-family : 'DiceFontD100'; + content : '\e95f'; + } + + &.d10-85::before { + font-family : 'DiceFontD100'; + content : '\e960'; + } + + &.d10-86::before { + font-family : 'DiceFontD100'; + content : '\e961'; + } + + &.d10-87::before { + font-family : 'DiceFontD100'; + content : '\e962'; + } + + &.d10-88::before { + font-family : 'DiceFontD100'; + content : '\e963'; + } + + &.d10-89::before { + font-family : 'DiceFontD100'; + content : '\e964'; + } + + &.d10-90::before { + font-family : 'DiceFontD100'; + content : '\e965'; + } + + &.d10-91::before { + font-family : 'DiceFontD100'; + content : '\e966'; + } + + &.d10-92::before { + font-family : 'DiceFontD100'; + content : '\e967'; + } + + &.d10-93::before { + font-family : 'DiceFontD100'; + content : '\e968'; + } + + &.d10-94::before { + font-family : 'DiceFontD100'; + content : '\e969'; + } + + &.d10-95::before { + font-family : 'DiceFontD100'; + content : '\e96a'; + } + + &.d10-96::before { + font-family : 'DiceFontD100'; + content : '\e96b'; + } + + &.d10-97::before { + font-family : 'DiceFontD100'; + content : '\e96c'; + } + + &.d10-98::before { + font-family : 'DiceFontD100'; + content : '\e96d'; + } + + &.d10-99::before { + font-family : 'DiceFontD100'; + content : '\e96e'; + } + + &.d10-100::before { + font-family : 'DiceFontD100'; + content : '\e96f'; + } } \ No newline at end of file diff --git a/themes/fonts/iconFonts/diceFontD100.woff2 b/themes/fonts/iconFonts/diceFontD100.woff2 new file mode 100644 index 000000000..6f7404cb8 Binary files /dev/null and b/themes/fonts/iconFonts/diceFontD100.woff2 differ