From c337184a2cdfc26285d7c13571f7bc7b66b1b37d Mon Sep 17 00:00:00 2001 From: learningstud Date: Fri, 30 Sep 2022 17:50:01 +0800 Subject: [PATCH 1/6] ZK-5253: title of borderlayout north/south shouldn't rotate 90 degrees --- src/archive/web/js/zul/layout/less/borderlayout.less | 7 ++++--- zkdoc/release-note | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/archive/web/js/zul/layout/less/borderlayout.less b/src/archive/web/js/zul/layout/less/borderlayout.less index 0ff880a..91a9d56 100644 --- a/src/archive/web/js/zul/layout/less/borderlayout.less +++ b/src/archive/web/js/zul/layout/less/borderlayout.less @@ -87,6 +87,10 @@ .z-west, .z-east { height: 100%; // Fixed for B30-1902533.zul + &-title { + .transform('rotate(90deg)'); + .applyCSS3('transform-origin', 'left bottom'); + } } .z-west, @@ -154,9 +158,6 @@ overflow: hidden; line-height: @iconHeight; position: absolute; - - .transform('rotate(90deg)'); - .applyCSS3('transform-origin', 'left bottom'); } } .z-north-splitter, diff --git a/zkdoc/release-note b/zkdoc/release-note index 89834c1..9b97339 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -2,6 +2,7 @@ Atlantic 9.6.3 * Features: * Bugs: + ZK-5253: title of borderlayout north/south shouldn't rotate 90 degrees * Upgrade Notes: From 9d5401b89678d78fca4bbf6f0bc85b5a81d33365 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 May 2022 07:04:41 +0000 Subject: [PATCH 2/6] Bump glob-parent from 5.1.1 to 5.1.2 Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/gulpjs/glob-parent/releases) - [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md) - [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2) --- updated-dependencies: - dependency-name: glob-parent dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0559942..313c2c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -235,9 +235,9 @@ } }, "node_modules/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==", "dependencies": { "is-glob": "^4.0.1" }, @@ -749,9 +749,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" } From 3d8e4ce0a85f832ad378b4806c7d8561d1c1be04 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Mar 2022 16:42:17 +0000 Subject: [PATCH 3/6] Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 313c2c7..ad4326c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -382,9 +382,9 @@ } }, "node_modules/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==" }, "node_modules/ms": { "version": "2.1.2", @@ -852,9 +852,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", From 83122a35bf17e67872c17f209fe9e9890f965dfe Mon Sep 17 00:00:00 2001 From: James Chu Date: Tue, 25 Oct 2022 10:26:47 +0800 Subject: [PATCH 4/6] release 9.6.3 --- pom.xml | 2 +- zkdoc/release-note | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3416fce..a799750 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.zkoss.theme atlantic - 9.6.3-SNAPSHOT + 9.6.3 9.6.0-Eval yyyy-MM-dd diff --git a/zkdoc/release-note b/zkdoc/release-note index 9b97339..c41fc57 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -1,4 +1,5 @@ Atlantic 9.6.3 +Oct 25, 2022 * Features: * Bugs: From 596d30726cb2dab864d223ae8d34edfba5427410 Mon Sep 17 00:00:00 2001 From: James Chu Date: Tue, 25 Oct 2022 10:36:44 +0800 Subject: [PATCH 5/6] upgrade to Atlantic 9.6.4 version --- pom.xml | 2 +- src/archive/metainfo/zk/config.xml | 2 +- src/archive/metainfo/zk/lang-addon.xml | 2 +- src/org/zkoss/theme/atlantic/Version.java | 2 +- version | 2 +- zkdoc/release-note | 8 ++++++++ 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a799750..da230e1 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.zkoss.theme atlantic - 9.6.3 + 9.6.4-SNAPSHOT 9.6.0-Eval yyyy-MM-dd diff --git a/src/archive/metainfo/zk/config.xml b/src/archive/metainfo/zk/config.xml index 2303b41..b7bfc88 100644 --- a/src/archive/metainfo/zk/config.xml +++ b/src/archive/metainfo/zk/config.xml @@ -5,7 +5,7 @@ zul org.zkoss.theme.atlantic.Version - 9.6.3 + 9.6.4 diff --git a/src/archive/metainfo/zk/lang-addon.xml b/src/archive/metainfo/zk/lang-addon.xml index 8cf671d..1c541f5 100644 --- a/src/archive/metainfo/zk/lang-addon.xml +++ b/src/archive/metainfo/zk/lang-addon.xml @@ -5,6 +5,6 @@ org.zkoss.theme.atlantic.Version - 9.6.3 + 9.6.4 diff --git a/src/org/zkoss/theme/atlantic/Version.java b/src/org/zkoss/theme/atlantic/Version.java index 47244ec..70dabe0 100644 --- a/src/org/zkoss/theme/atlantic/Version.java +++ b/src/org/zkoss/theme/atlantic/Version.java @@ -3,5 +3,5 @@ public class Version { /** Returns the version UID. */ - public static final String UID = "9.6.3"; + public static final String UID = "9.6.4"; } diff --git a/version b/version index 821543e..da9c4c2 100644 --- a/version +++ b/version @@ -1,2 +1,2 @@ 9.0.0 -9.6.3 +9.6.4 diff --git a/zkdoc/release-note b/zkdoc/release-note index c41fc57..66d6b72 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -1,3 +1,11 @@ +Atlantic 9.6.4 +* Features: + +* Bugs: + +* Upgrade Notes: + + -------- Atlantic 9.6.3 Oct 25, 2022 * Features: From 628f9421afda5453b3a80f77eb5dfd977c9c5686 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 22:11:21 +0000 Subject: [PATCH 6/6] Bump socket.io-parser from 4.0.4 to 4.0.5 Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 4.0.4 to 4.0.5. - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/main/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/4.0.4...4.0.5) --- updated-dependencies: - dependency-name: socket.io-parser dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ad4326c..725f13e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -489,9 +489,9 @@ "integrity": "sha512-8cVkRxI8Nt2wadkY6u60Y4rpW3ejA1rxgcK2JuyIhmF+RMNpTy1QRtkHIDUOf3B4HlQwakMsWbKftMv/71VMmw==" }, "node_modules/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==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz", + "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==", "dependencies": { "@types/component-emitter": "^1.2.10", "component-emitter": "~1.3.0", @@ -935,9 +935,9 @@ "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==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz", + "integrity": "sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==", "requires": { "@types/component-emitter": "^1.2.10", "component-emitter": "~1.3.0",