diff --git a/breeze/pom.xml b/breeze/pom.xml index 2a55a601..6e08062a 100644 --- a/breeze/pom.xml +++ b/breeze/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.3-SNAPSHOT + 9.6.5-SNAPSHOT breeze jar diff --git a/breeze/src/archive/metainfo/zk/config.xml b/breeze/src/archive/metainfo/zk/config.xml index 0adedf62..2c560d95 100644 --- a/breeze/src/archive/metainfo/zk/config.xml +++ b/breeze/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.breeze.Version - 9.6.3 + 9.6.5 diff --git a/breeze/src/archive/metainfo/zk/lang-addon.xml b/breeze/src/archive/metainfo/zk/lang-addon.xml index 3334f94a..95ec55a1 100644 --- a/breeze/src/archive/metainfo/zk/lang-addon.xml +++ b/breeze/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.breeze.Version - 9.6.3 + 9.6.5 diff --git a/breeze/src/archive/web/zul/less/_reset.less b/breeze/src/archive/web/zul/less/_reset.less index 8f8f7857..ac199b75 100644 --- a/breeze/src/archive/web/zul/less/_reset.less +++ b/breeze/src/archive/web/zul/less/_reset.less @@ -6,26 +6,27 @@ // Display in IE6-9 and FF3 // ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { +@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; +@browserDefaultPrefix: e('${".z-page "}'); +@{browserDefaultPrefix}article, +@{browserDefaultPrefix}aside, +@{browserDefaultPrefix}details, +@{browserDefaultPrefix}figcaption, +@{browserDefaultPrefix}figure, +@{browserDefaultPrefix}footer, +@{browserDefaultPrefix}header, +@{browserDefaultPrefix}hgroup, +@{browserDefaultPrefix}nav, +@{browserDefaultPrefix}section { display: block; } // Display block in IE6-9 and FF3 // ------------------------- -audio, -canvas, -video { +@{browserDefaultPrefix}audio, +@{browserDefaultPrefix}canvas, +@{browserDefaultPrefix}video { display: inline-block; *display: inline; *zoom: 1; @@ -34,51 +35,53 @@ video { // Prevents modern browsers from displaying 'audio' without controls // ------------------------- -audio:not([controls]) { - display: none; +@{browserDefaultPrefix}audio:not([controls]) { + display: none; } // Base settings // ------------------------- +e(''); html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } +e(''); // Focus states -a:focus { +@{browserDefaultPrefix}a:focus { outline: none; // Disable for Potix on 5/29/2013 //.tab-focus(); } // Hover & Active -a:hover, -a:active { +@{browserDefaultPrefix}a:hover, +@{browserDefaultPrefix}a:active { outline: 0; } // Prevents sub and sup affecting line-height in all browsers // ------------------------- -sub, -sup { +@{browserDefaultPrefix}sub, +@{browserDefaultPrefix}sup { position: relative; font-size: 75%; line-height: 0; vertical-align: baseline; } -sup { +@{browserDefaultPrefix}sup { top: -0.5em; } -sub { +@{browserDefaultPrefix}sub { bottom: -0.25em; } // Img border in a's and image quality // ------------------------- -img { +@{browserDefaultPrefix}img { /* Responsive images (ensure images don't scale beyond their parents) */ // Potix: this style will make img invisible in ie8 @@ -101,52 +104,53 @@ img { // ------------------------- // Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}textarea { margin: 0; font-size: 100%; vertical-align: middle; } -button, -input { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input { *overflow: visible; // Inner spacing ie IE6/7 line-height: normal; // FF3/4 have !important on line-height in UA stylesheet } -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 +@{browserDefaultPrefix}label, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"], +@{browserDefaultPrefix}input[type="radio"], +@{browserDefaultPrefix}input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +// Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. +@{browserDefaultPrefix}button, +html @{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"] { + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +@{browserDefaultPrefix}button::-moz-focus-inner, +@{browserDefaultPrefix}input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 padding: 0; border: 0; } -button, -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -input[type="search"] { // Appearance in Safari/Chrome +@{browserDefaultPrefix}input[type="search"] { // Appearance in Safari/Chrome // Potix: using zk mixins //.box-sizing(content-box); .applyCSS3('box-sizing', 'content-box'); -webkit-appearance: textfield; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +@{browserDefaultPrefix}input[type="search"]::-webkit-search-decoration, +@{browserDefaultPrefix}input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 } -textarea { +@{browserDefaultPrefix}textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } diff --git a/breeze/src/archive/web/zul/less/norm.less b/breeze/src/archive/web/zul/less/norm.less index 816b375a..1e45daf2 100644 --- a/breeze/src/archive/web/zul/less/norm.less +++ b/breeze/src/archive/web/zul/less/norm.less @@ -1,9 +1,11 @@ @import "~./zul/less/_header.less"; @import "~./zul/less/_reset.less"; +e(''); html, body { height: 100%; } +e(''); // affect ZK component only [class^="z-"], @@ -17,33 +19,33 @@ html, body { } // Reset -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { +@{browserDefaultPrefix}input[type=number]::-webkit-inner-spin-button, +@{browserDefaultPrefix}input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } -input, -input:focus, -textarea, -textarea:focus { +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}input:focus, +@{browserDefaultPrefix}textarea, +@{browserDefaultPrefix}textarea:focus { -webkit-appearance: none; -moz-appearance: none; outline: none; -webkit-user-select: text; } -*:focus { +@{browserDefaultPrefix}*:focus { outline: none; } -fieldset { +@{browserDefaultPrefix}fieldset { border: 1px solid #c0c0c0; border-radius: 0; margin: 0 2px; padding: 0px; } -legend { +@{browserDefaultPrefix}legend { border: 0; padding: 0; } @@ -54,7 +56,6 @@ legend { } } -@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; e(''); body { margin: 0; @@ -166,14 +167,14 @@ div.z-log { } //radio, radiogroup -input[type="radio"] { +@{browserDefaultPrefix}input[type="radio"] { -webkit-appearance: radio; -moz-appearance: radio; margin: 0px 2px 2px; } //checkbox -input[type="checkbox"] { +@{browserDefaultPrefix}input[type="checkbox"] { -webkit-appearance: checkbox; -moz-appearance: checkbox; margin: 0px 2px 2px; diff --git a/breeze/src/org/zkoss/theme/breeze/Version.java b/breeze/src/org/zkoss/theme/breeze/Version.java index 46926d7a..3019bbd3 100644 --- a/breeze/src/org/zkoss/theme/breeze/Version.java +++ b/breeze/src/org/zkoss/theme/breeze/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.3"; + public static final String UID = "9.6.5"; } diff --git a/breeze/version b/breeze/version index 3a2d20d3..462e1ca0 100644 --- a/breeze/version +++ b/breeze/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/contributing.md b/contributing.md new file mode 100644 index 00000000..18a7fa5d --- /dev/null +++ b/contributing.md @@ -0,0 +1,23 @@ + +Contributions of all kinds are welcome! + +**Reporting Issues** + +\* Please use [ZK tracker](https://tracker.zkoss.org/projects/ZK) to report issues. + +\* Before creating an issue, please review open issues to avoid a duplicate. + +\* If you have a question, not an issue, please discuss it in [ZK Forum](https://forum.zkoss.org/questions/). + +**Contributing codes** + +If you wish to contribute code, please create a corresponding issue [in tracker](https://tracker.zkoss.org/projects/ZK) and a pull request containing the ID of the issue from the tracker with your comments. Your request will be reviewed before being merged. + +**License and Copyright** + +This project is created and maintained by Potix Corporation. + +Any contributed content is licensed under the same license and terms as the project license. By contributing your code, you certify that you created the content and agree to surrender your copyright of the contributed code to Potix. + + +For any inquiries and questions, please contact us at info@zkoss.org. diff --git a/dist/breeze.jar b/dist/breeze.jar index 35975719..8b52153d 100644 Binary files a/dist/breeze.jar and b/dist/breeze.jar differ diff --git a/dist/sapphire.jar b/dist/sapphire.jar index 2d1b055c..0b500a63 100644 Binary files a/dist/sapphire.jar and b/dist/sapphire.jar differ diff --git a/dist/silvertail.jar b/dist/silvertail.jar index 73a975bf..6c95937a 100644 Binary files a/dist/silvertail.jar and b/dist/silvertail.jar differ diff --git a/package-lock.json b/package-lock.json index 13af17ab..773725ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,23 +1,595 @@ { "name": "zkthemes", "version": "0.0.1", - "lockfileVersion": 1, + "lockfileVersion": 2, "requires": true, - "dependencies": { - "@types/component-emitter": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.10.tgz", - "integrity": "sha512-bsjleuRKWmGqajMerkzox19aGbscQX5rmmvvXl3wlIp5gMG1HgkiwPxsN5p070fBDKTNSPgojVbuY1+HWMbFhg==" + "packages": { + "": { + "name": "zkthemes", + "version": "0.0.1", + "dependencies": { + "zkless-engine": "^1.1.8" + } + }, + "node_modules/@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" + }, + "node_modules/@types/node": { + "version": "15.9.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-15.9.0.tgz", + "integrity": "sha512-AR1Vq1Ei1GaA5FjKL5PBqblTZsL5M+monvGSZwe6sSIdGiuu7Xr/pNwWJY+0ZQuN8AapD/XMB5IzBAyYRFbocA==" + }, + "node_modules/accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dependencies": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dependencies": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/base64id": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", + "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==", + "engines": { + "node": "^4.5.0 || >= 5.9" + } + }, + "node_modules/binary-extensions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", + "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==", + "engines": { + "node": ">=8" + } + }, + "node_modules/braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dependencies": { + "fill-range": "^7.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/chokidar": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz", + "integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==", + "dependencies": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.5.0" + }, + "engines": { + "node": ">= 8.10.0" + }, + "optionalDependencies": { + "fsevents": "~2.3.1" + } + }, + "node_modules/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/copy-anything": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.1.tgz", + "integrity": "sha512-lA57e7viQHOdPQcrytv5jFeudZZOXuyk47lZym279FiDQ8jeZomXiGuVf6ffMKkJ+3TIai3J1J3yi6M+/4U35g==", + "dependencies": { + "is-what": "^3.7.1" + } + }, + "node_modules/cors": { + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", + "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", + "dependencies": { + "object-assign": "^4", + "vary": "^1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/debug": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", + "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/engine.io": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz", + "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==", + "dependencies": { + "@types/cookie": "^0.4.1", + "@types/cors": "^2.8.12", + "@types/node": ">=10.0.0", + "accepts": "~1.3.4", + "base64id": "2.0.0", + "cookie": "~0.4.1", + "cors": "~2.8.5", + "debug": "~4.3.1", + "engine.io-parser": "~5.0.3", + "ws": "~8.2.3" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/engine.io/node_modules/@types/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==" + }, + "node_modules/engine.io/node_modules/@types/cors": { + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + }, + "node_modules/engine.io/node_modules/engine.io-parser": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", + "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==", + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/engine.io/node_modules/ws": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "engines": { + "node": ">=10.0.0" + }, + "peerDependencies": { + "bufferutil": "^4.0.1", + "utf-8-validate": "^5.0.2" + }, + "peerDependenciesMeta": { + "bufferutil": { + "optional": true + }, + "utf-8-validate": { + "optional": true + } + } + }, + "node_modules/errno": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz", + "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==", + "optional": true, + "dependencies": { + "prr": "~1.0.1" + }, + "bin": { + "errno": "cli.js" + } + }, + "node_modules/fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dependencies": { + "to-regex-range": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/fs-extra": { + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", + "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + }, + "engines": { + "node": ">=6 <7 || >=8" + } + }, + "node_modules/fsevents": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", + "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dependencies": { + "is-glob": "^4.0.1" + }, + "engines": { + "node": ">= 6" + } }, - "@types/cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg==" + "node_modules/graceful-fs": { + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" }, - "@types/cors": { - "version": "2.8.10", - "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz", - "integrity": "sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==" + "node_modules/image-size": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", + "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", + "optional": true, + "bin": { + "image-size": "bin/image-size.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dependencies": { + "binary-extensions": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dependencies": { + "is-extglob": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "engines": { + "node": ">=0.12.0" + } + }, + "node_modules/is-what": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/is-what/-/is-what-3.12.0.tgz", + "integrity": "sha512-2ilQz5/f/o9V7WRWJQmpFYNmQFZ9iM+OXRonZKcYgTkCzjb949Vi4h282PD1UfmgHk666rcWonbRJ++KI41VGw==" + }, + "node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/less": { + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/less/-/less-3.13.1.tgz", + "integrity": "sha512-SwA1aQXGUvp+P5XdZslUOhhLnClSLIjWvJhmd+Vgib5BFIr9lMNlQwmwUNOjXThF/A0x+MCYYPeWEfeWiLRnTw==", + "dependencies": { + "copy-anything": "^2.0.1", + "tslib": "^1.10.0" + }, + "bin": { + "lessc": "bin/lessc" + }, + "engines": { + "node": ">=6" + }, + "optionalDependencies": { + "errno": "^0.1.1", + "graceful-fs": "^4.1.2", + "image-size": "~0.5.0", + "make-dir": "^2.1.0", + "mime": "^1.4.1", + "native-request": "^1.0.5", + "source-map": "~0.6.0" + } + }, + "node_modules/make-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz", + "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==", + "optional": true, + "dependencies": { + "pify": "^4.0.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "optional": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.48.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.48.0.tgz", + "integrity": "sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.31", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.31.tgz", + "integrity": "sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==", + "dependencies": { + "mime-db": "1.48.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" + }, + "node_modules/ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "node_modules/native-request": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz", + "integrity": "sha512-vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag==", + "optional": true + }, + "node_modules/negotiator": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", + "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", + "engines": { + "node": ">=8.6" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "optional": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/prr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", + "optional": true + }, + "node_modules/readdirp": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz", + "integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==", + "dependencies": { + "picomatch": "^2.2.1" + }, + "engines": { + "node": ">=8.10.0" + } + }, + "node_modules/semver": { + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", + "optional": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/socket.io": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.2.tgz", + "integrity": "sha512-6fCnk4ARMPZN448+SQcnn1u8OHUC72puJcNtSgg2xS34Cu7br1gQ09YKkO1PFfDn/wyUE9ZgMAwosJed003+NQ==", + "dependencies": { + "accepts": "~1.3.4", + "base64id": "~2.0.0", + "debug": "~4.3.2", + "engine.io": "~6.2.0", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.0" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/socket.io/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, + "node_modules/socket.io/node_modules/socket.io-adapter": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" + }, + "node_modules/socket.io/node_modules/socket.io-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", + "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "dependencies": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1" + }, + "engines": { + "node": ">=10.0.0" + } + }, + "node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dependencies": { + "is-number": "^7.0.0" + }, + "engines": { + "node": ">=8.0" + } + }, + "node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==" + }, + "node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/zkless-engine": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/zkless-engine/-/zkless-engine-1.1.8.tgz", + "integrity": "sha512-plLqdVIhHrMKPcaHHfXZuaCkMT1HXqMhK6nXaYMYh34wQN53sXTs0MJwiFCYaEcm7kBi6O9JDM1ubE+jXs1TLg==", + "dependencies": { + "chokidar": "^3.5.1", + "fs-extra": "^8.1.0", + "less": "^3.13.1", + "minimist": "^1.2.5", + "socket.io": "^4.1.2" + }, + "bin": { + "zklessc": "bin/zkless-cli.js" + }, + "engines": { + "node": ">= 10.16" + } + } + }, + "dependencies": { + "@socket.io/component-emitter": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz", + "integrity": "sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==" }, "@types/node": { "version": "15.9.0", @@ -42,11 +614,6 @@ "picomatch": "^2.0.4" } }, - "base64-arraybuffer": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz", - "integrity": "sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=" - }, "base64id": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz", @@ -80,11 +647,6 @@ "readdirp": "~3.5.0" } }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" - }, "cookie": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz", @@ -116,25 +678,43 @@ } }, "engine.io": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-5.1.1.tgz", - "integrity": "sha512-aMWot7H5aC8L4/T8qMYbLdvKlZOdJTH54FxfdFunTGvhMx1BHkJOntWArsVfgAZVwAO9LC2sryPWRcEeUzCe5w==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz", + "integrity": "sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==", "requires": { + "@types/cookie": "^0.4.1", + "@types/cors": "^2.8.12", + "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "2.0.0", "cookie": "~0.4.1", "cors": "~2.8.5", "debug": "~4.3.1", - "engine.io-parser": "~4.0.0", - "ws": "~7.4.2" - } - }, - "engine.io-parser": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-4.0.2.tgz", - "integrity": "sha512-sHfEQv6nmtJrq6TKuIz5kyEKH/qSdK56H/A+7DnAuUPWosnIZAS2NHNcPLmyjtY3cGS/MqJdZbUjW97JU72iYg==", - "requires": { - "base64-arraybuffer": "0.1.4" + "engine.io-parser": "~5.0.3", + "ws": "~8.2.3" + }, + "dependencies": { + "@types/cookie": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz", + "integrity": "sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==" + }, + "@types/cors": { + "version": "2.8.12", + "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz", + "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==" + }, + "engine.io-parser": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz", + "integrity": "sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==" + }, + "ws": { + "version": "8.2.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz", + "integrity": "sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==", + "requires": {} + } } }, "errno": { @@ -171,9 +751,9 @@ "optional": true }, "glob-parent": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", - "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "requires": { "is-glob": "^4.0.1" } @@ -274,9 +854,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "ms": { "version": "2.1.2", @@ -330,40 +910,46 @@ } }, "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "version": "5.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", + "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "optional": true }, "socket.io": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.1.2.tgz", - "integrity": "sha512-xK0SD1C7hFrh9+bYoYCdVt+ncixkSLKtNLCax5aEy1o3r5PaO5yQhVb97exIe67cE7lAK+EpyMytXWTWmyZY8w==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.5.2.tgz", + "integrity": "sha512-6fCnk4ARMPZN448+SQcnn1u8OHUC72puJcNtSgg2xS34Cu7br1gQ09YKkO1PFfDn/wyUE9ZgMAwosJed003+NQ==", "requires": { - "@types/cookie": "^0.4.0", - "@types/cors": "^2.8.8", - "@types/node": ">=10.0.0", "accepts": "~1.3.4", "base64id": "~2.0.0", - "debug": "~4.3.1", - "engine.io": "~5.1.0", - "socket.io-adapter": "~2.3.0", - "socket.io-parser": "~4.0.3" - } - }, - "socket.io-adapter": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.3.1.tgz", - "integrity": "sha512-8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw==" - }, - "socket.io-parser": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.4.tgz", - "integrity": "sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==", - "requires": { - "@types/component-emitter": "^1.2.10", - "component-emitter": "~1.3.0", - "debug": "~4.3.1" + "debug": "~4.3.2", + "engine.io": "~6.2.0", + "socket.io-adapter": "~2.4.0", + "socket.io-parser": "~4.2.0" + }, + "dependencies": { + "debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "requires": { + "ms": "2.1.2" + } + }, + "socket.io-adapter": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz", + "integrity": "sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==" + }, + "socket.io-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz", + "integrity": "sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g==", + "requires": { + "@socket.io/component-emitter": "~3.1.0", + "debug": "~4.3.1" + } + } } }, "source-map": { @@ -395,11 +981,6 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "ws": { - "version": "7.4.6", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz", - "integrity": "sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==" - }, "zkless-engine": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/zkless-engine/-/zkless-engine-1.1.8.tgz", diff --git a/pom.xml b/pom.xml index 226ec42a..1551ae32 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.zkoss.theme zktheme - 9.6.3-SNAPSHOT + 9.6.5-SNAPSHOT pom ZK Theme Maven Bulider http://www.zkoss.org/themes diff --git a/sapphire/pom.xml b/sapphire/pom.xml index 3a575382..973306eb 100644 --- a/sapphire/pom.xml +++ b/sapphire/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.3-SNAPSHOT + 9.6.5-SNAPSHOT sapphire jar diff --git a/sapphire/src/archive/metainfo/zk/config.xml b/sapphire/src/archive/metainfo/zk/config.xml index e137a83f..f7eb6d70 100644 --- a/sapphire/src/archive/metainfo/zk/config.xml +++ b/sapphire/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.sapphire.Version - 9.6.3 + 9.6.5 diff --git a/sapphire/src/archive/metainfo/zk/lang-addon.xml b/sapphire/src/archive/metainfo/zk/lang-addon.xml index 0768b298..b53e2d90 100644 --- a/sapphire/src/archive/metainfo/zk/lang-addon.xml +++ b/sapphire/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.sapphire.Version - 9.6.3 + 9.6.5 diff --git a/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less b/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less index 1729ae57..21ae050f 100644 --- a/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less +++ b/sapphire/src/archive/web/js/zul/layout/less/borderlayout.less @@ -150,6 +150,13 @@ .opacity(0.5); position: absolute; } + &-title { + .fontStyle(@baseTitleFontFamily, @fontSizeMedium, bold, @textColorGray); + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + line-height: @baseButtonHeight; + } } .z-north-splitter, .z-south-splitter { diff --git a/sapphire/src/archive/web/zul/less/_reset.less b/sapphire/src/archive/web/zul/less/_reset.less index cc10a0a7..37e8413d 100644 --- a/sapphire/src/archive/web/zul/less/_reset.less +++ b/sapphire/src/archive/web/zul/less/_reset.less @@ -6,26 +6,27 @@ // Display in IE6-9 and FF3 // ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { +@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; +@browserDefaultPrefix: e('${".z-page "}'); +@{browserDefaultPrefix}article, +@{browserDefaultPrefix}aside, +@{browserDefaultPrefix}details, +@{browserDefaultPrefix}figcaption, +@{browserDefaultPrefix}figure, +@{browserDefaultPrefix}footer, +@{browserDefaultPrefix}header, +@{browserDefaultPrefix}hgroup, +@{browserDefaultPrefix}nav, +@{browserDefaultPrefix}section { display: block; } // Display block in IE6-9 and FF3 // ------------------------- -audio, -canvas, -video { +@{browserDefaultPrefix}audio, +@{browserDefaultPrefix}canvas, +@{browserDefaultPrefix}video { display: inline-block; *display: inline; *zoom: 1; @@ -34,51 +35,53 @@ video { // Prevents modern browsers from displaying 'audio' without controls // ------------------------- -audio:not([controls]) { - display: none; +@{browserDefaultPrefix}audio:not([controls]) { + display: none; } // Base settings // ------------------------- +e(''); html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } +e(''); // Focus states -a:focus { +@{browserDefaultPrefix}a:focus { outline: none; // Disable for Potix on 5/29/2013 //.tab-focus(); } // Hover & Active -a:hover, -a:active { +@{browserDefaultPrefix}a:hover, +@{browserDefaultPrefix}a:active { outline: 0; } // Prevents sub and sup affecting line-height in all browsers // ------------------------- -sub, -sup { +@{browserDefaultPrefix}sub, +@{browserDefaultPrefix}sup { position: relative; font-size: 75%; line-height: 0; vertical-align: baseline; } -sup { +@{browserDefaultPrefix}sup { top: -0.5em; } -sub { +@{browserDefaultPrefix}sub { bottom: -0.25em; } // Img border in a's and image quality // ------------------------- -img { +@{browserDefaultPrefix}img { /* Responsive images (ensure images don't scale beyond their parents) */ // Potix: this style will make img invisible in ie8 @@ -101,52 +104,53 @@ img { // ------------------------- // Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}textarea { margin: 0; font-size: 100%; vertical-align: middle; } -button, -input { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input { *overflow: visible; // Inner spacing ie IE6/7 line-height: normal; // FF3/4 have !important on line-height in UA stylesheet } -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 +@{browserDefaultPrefix}label, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"], +@{browserDefaultPrefix}input[type="radio"], +@{browserDefaultPrefix}input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +// Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. +@{browserDefaultPrefix}button, +html @{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"] { + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +@{browserDefaultPrefix}button::-moz-focus-inner, +@{browserDefaultPrefix}input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 padding: 0; border: 0; } -button, -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -input[type="search"] { // Appearance in Safari/Chrome +@{browserDefaultPrefix}input[type="search"] { // Appearance in Safari/Chrome // Potix: using zk mixins //.box-sizing(content-box); .applyCSS3('box-sizing', 'content-box'); -webkit-appearance: textfield; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +@{browserDefaultPrefix}input[type="search"]::-webkit-search-decoration, +@{browserDefaultPrefix}input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 } -textarea { +@{browserDefaultPrefix}textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } diff --git a/sapphire/src/archive/web/zul/less/norm.less b/sapphire/src/archive/web/zul/less/norm.less index feedac85..f9c2ff07 100644 --- a/sapphire/src/archive/web/zul/less/norm.less +++ b/sapphire/src/archive/web/zul/less/norm.less @@ -1,9 +1,11 @@ @import "~./zul/less/_header.less"; @import "~./zul/less/_reset.less"; +e(''); html, body { height: 100%; } +e(''); // affect ZK component only [class^="z-"], @@ -17,33 +19,33 @@ html, body { } // Reset -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { +@{browserDefaultPrefix}input[type=number]::-webkit-inner-spin-button, +@{browserDefaultPrefix}input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } -input, -input:focus, -textarea, -textarea:focus { +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}input:focus, +@{browserDefaultPrefix}textarea, +@{browserDefaultPrefix}textarea:focus { -webkit-appearance: none; -moz-appearance: none; outline: none; -webkit-user-select: text; } -*:focus { +@{browserDefaultPrefix}*:focus { outline: none; } -fieldset { +@{browserDefaultPrefix}fieldset { border: 1px solid #c0c0c0; border-radius: 0; margin: 0 2px; padding: 0px; } -legend { +@{browserDefaultPrefix}legend { border: 0; padding: 0; } @@ -54,7 +56,6 @@ legend { } } -@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; e(''); body { margin: 0; @@ -166,14 +167,14 @@ div.z-log { } //radio, radiogroup -input[type="radio"] { +@{browserDefaultPrefix}input[type="radio"] { -webkit-appearance: radio; -moz-appearance: radio; margin: 0px 2px 2px; } //checkbox -input[type="checkbox"] { +@{browserDefaultPrefix}input[type="checkbox"] { -webkit-appearance: checkbox; -moz-appearance: checkbox; margin: 0px 2px 2px; diff --git a/sapphire/src/org/zkoss/theme/sapphire/Version.java b/sapphire/src/org/zkoss/theme/sapphire/Version.java index 5e37ba1c..56a8a42d 100644 --- a/sapphire/src/org/zkoss/theme/sapphire/Version.java +++ b/sapphire/src/org/zkoss/theme/sapphire/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.3"; + public static final String UID = "9.6.5"; } diff --git a/sapphire/version b/sapphire/version index 3a2d20d3..462e1ca0 100644 --- a/sapphire/version +++ b/sapphire/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/silvertail/pom.xml b/silvertail/pom.xml index c72b3ac4..c9d4df51 100644 --- a/silvertail/pom.xml +++ b/silvertail/pom.xml @@ -6,7 +6,7 @@ org.zkoss.theme zktheme - 9.6.3-SNAPSHOT + 9.6.5-SNAPSHOT silvertail jar diff --git a/silvertail/src/archive/metainfo/zk/config.xml b/silvertail/src/archive/metainfo/zk/config.xml index 63434efc..27f29698 100644 --- a/silvertail/src/archive/metainfo/zk/config.xml +++ b/silvertail/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.silvertail.Version - 9.6.3 + 9.6.5 diff --git a/silvertail/src/archive/metainfo/zk/lang-addon.xml b/silvertail/src/archive/metainfo/zk/lang-addon.xml index 69ee3e6a..1f104391 100644 --- a/silvertail/src/archive/metainfo/zk/lang-addon.xml +++ b/silvertail/src/archive/metainfo/zk/lang-addon.xml @@ -5,7 +5,7 @@ org.zkoss.theme.silvertail.Version - 9.6.3 + 9.6.5 diff --git a/silvertail/src/archive/web/zul/less/_reset.less b/silvertail/src/archive/web/zul/less/_reset.less index cc10a0a7..37e8413d 100644 --- a/silvertail/src/archive/web/zul/less/_reset.less +++ b/silvertail/src/archive/web/zul/less/_reset.less @@ -6,26 +6,27 @@ // Display in IE6-9 and FF3 // ------------------------- - -article, -aside, -details, -figcaption, -figure, -footer, -header, -hgroup, -nav, -section { +@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; +@browserDefaultPrefix: e('${".z-page "}'); +@{browserDefaultPrefix}article, +@{browserDefaultPrefix}aside, +@{browserDefaultPrefix}details, +@{browserDefaultPrefix}figcaption, +@{browserDefaultPrefix}figure, +@{browserDefaultPrefix}footer, +@{browserDefaultPrefix}header, +@{browserDefaultPrefix}hgroup, +@{browserDefaultPrefix}nav, +@{browserDefaultPrefix}section { display: block; } // Display block in IE6-9 and FF3 // ------------------------- -audio, -canvas, -video { +@{browserDefaultPrefix}audio, +@{browserDefaultPrefix}canvas, +@{browserDefaultPrefix}video { display: inline-block; *display: inline; *zoom: 1; @@ -34,51 +35,53 @@ video { // Prevents modern browsers from displaying 'audio' without controls // ------------------------- -audio:not([controls]) { - display: none; +@{browserDefaultPrefix}audio:not([controls]) { + display: none; } // Base settings // ------------------------- +e(''); html { font-size: 100%; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } +e(''); // Focus states -a:focus { +@{browserDefaultPrefix}a:focus { outline: none; // Disable for Potix on 5/29/2013 //.tab-focus(); } // Hover & Active -a:hover, -a:active { +@{browserDefaultPrefix}a:hover, +@{browserDefaultPrefix}a:active { outline: 0; } // Prevents sub and sup affecting line-height in all browsers // ------------------------- -sub, -sup { +@{browserDefaultPrefix}sub, +@{browserDefaultPrefix}sup { position: relative; font-size: 75%; line-height: 0; vertical-align: baseline; } -sup { +@{browserDefaultPrefix}sup { top: -0.5em; } -sub { +@{browserDefaultPrefix}sub { bottom: -0.25em; } // Img border in a's and image quality // ------------------------- -img { +@{browserDefaultPrefix}img { /* Responsive images (ensure images don't scale beyond their parents) */ // Potix: this style will make img invisible in ie8 @@ -101,52 +104,53 @@ img { // ------------------------- // Font size in all browsers, margin changes, misc consistency -button, -input, -select, -textarea { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}textarea { margin: 0; font-size: 100%; vertical-align: middle; } -button, -input { +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input { *overflow: visible; // Inner spacing ie IE6/7 line-height: normal; // FF3/4 have !important on line-height in UA stylesheet } -button::-moz-focus-inner, -input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 +@{browserDefaultPrefix}label, +@{browserDefaultPrefix}select, +@{browserDefaultPrefix}button, +@{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"], +@{browserDefaultPrefix}input[type="radio"], +@{browserDefaultPrefix}input[type="checkbox"] { + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +// Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. +@{browserDefaultPrefix}button, +html @{browserDefaultPrefix}input[type="button"], +@{browserDefaultPrefix}input[type="reset"], +@{browserDefaultPrefix}input[type="submit"] { + -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. + cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. +} +@{browserDefaultPrefix}button::-moz-focus-inner, +@{browserDefaultPrefix}input::-moz-focus-inner { // Inner padding and border oddities in FF3/4 padding: 0; border: 0; } -button, -html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. -input[type="reset"], -input[type="submit"] { - -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS. - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -label, -select, -button, -input[type="button"], -input[type="reset"], -input[type="submit"], -input[type="radio"], -input[type="checkbox"] { - cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others. -} -input[type="search"] { // Appearance in Safari/Chrome +@{browserDefaultPrefix}input[type="search"] { // Appearance in Safari/Chrome // Potix: using zk mixins //.box-sizing(content-box); .applyCSS3('box-sizing', 'content-box'); -webkit-appearance: textfield; } -input[type="search"]::-webkit-search-decoration, -input[type="search"]::-webkit-search-cancel-button { +@{browserDefaultPrefix}input[type="search"]::-webkit-search-decoration, +@{browserDefaultPrefix}input[type="search"]::-webkit-search-cancel-button { -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5 } -textarea { +@{browserDefaultPrefix}textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser } diff --git a/silvertail/src/archive/web/zul/less/norm.less b/silvertail/src/archive/web/zul/less/norm.less index feedac85..f9c2ff07 100644 --- a/silvertail/src/archive/web/zul/less/norm.less +++ b/silvertail/src/archive/web/zul/less/norm.less @@ -1,9 +1,11 @@ @import "~./zul/less/_header.less"; @import "~./zul/less/_reset.less"; +e(''); html, body { height: 100%; } +e(''); // affect ZK component only [class^="z-"], @@ -17,33 +19,33 @@ html, body { } // Reset -input[type=number]::-webkit-inner-spin-button, -input[type=number]::-webkit-outer-spin-button { +@{browserDefaultPrefix}input[type=number]::-webkit-inner-spin-button, +@{browserDefaultPrefix}input[type=number]::-webkit-outer-spin-button { -webkit-appearance: none; margin: 0; } -input, -input:focus, -textarea, -textarea:focus { +@{browserDefaultPrefix}input, +@{browserDefaultPrefix}input:focus, +@{browserDefaultPrefix}textarea, +@{browserDefaultPrefix}textarea:focus { -webkit-appearance: none; -moz-appearance: none; outline: none; -webkit-user-select: text; } -*:focus { +@{browserDefaultPrefix}*:focus { outline: none; } -fieldset { +@{browserDefaultPrefix}fieldset { border: 1px solid #c0c0c0; border-radius: 0; margin: 0 2px; padding: 0px; } -legend { +@{browserDefaultPrefix}legend { border: 0; padding: 0; } @@ -54,7 +56,6 @@ legend { } } -@browserDefault: "'org.zkoss.zul.theme.browserDefault'"; e(''); body { margin: 0; @@ -166,14 +167,14 @@ div.z-log { } //radio, radiogroup -input[type="radio"] { +@{browserDefaultPrefix}input[type="radio"] { -webkit-appearance: radio; -moz-appearance: radio; margin: 0px 2px 2px; } //checkbox -input[type="checkbox"] { +@{browserDefaultPrefix}input[type="checkbox"] { -webkit-appearance: checkbox; -moz-appearance: checkbox; margin: 0px 2px 2px; diff --git a/silvertail/src/org/zkoss/theme/silvertail/Version.java b/silvertail/src/org/zkoss/theme/silvertail/Version.java index e81b4fad..cb0d994d 100644 --- a/silvertail/src/org/zkoss/theme/silvertail/Version.java +++ b/silvertail/src/org/zkoss/theme/silvertail/Version.java @@ -26,5 +26,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.3"; + public static final String UID = "9.6.5"; } diff --git a/silvertail/version b/silvertail/version index 3a2d20d3..462e1ca0 100644 --- a/silvertail/version +++ b/silvertail/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/version b/version index 3a2d20d3..462e1ca0 100644 --- a/version +++ b/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.5 \ No newline at end of file diff --git a/zkthemedemo/pom.xml b/zkthemedemo/pom.xml index 2142aeca..61c9c222 100644 --- a/zkthemedemo/pom.xml +++ b/zkthemedemo/pom.xml @@ -4,7 +4,7 @@ zktheme org.zkoss.theme - 9.6.3-SNAPSHOT + 9.6.5-SNAPSHOT zkthemedemo war @@ -63,7 +63,7 @@ org.zkoss.theme atlantic - 9.6.2 + 9.6.4 org.zkoss.theme diff --git a/zkthemedemo/version b/zkthemedemo/version index 3a2d20d3..462e1ca0 100644 --- a/zkthemedemo/version +++ b/zkthemedemo/version @@ -1 +1 @@ -9.6.3 \ No newline at end of file +9.6.5 \ No newline at end of file