Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump socket.io-parser from 4.0.4 to 4.0.5 #229

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.zkoss.theme</groupId>
<artifactId>atlantic</artifactId>
<version>9.6.3-SNAPSHOT</version>
<version>9.6.4-SNAPSHOT</version>
<properties>
<zk.version>9.6.0-Eval</zk.version>
<maven.build.timestamp.format>yyyy-MM-dd</maven.build.timestamp.format>
Expand Down
2 changes: 1 addition & 1 deletion src/archive/metainfo/zk/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<depends>zul</depends>
<version>
<version-class>org.zkoss.theme.atlantic.Version</version-class>
<version-uid>9.6.3</version-uid>
<version-uid>9.6.4</version-uid>
</version>

<listener>
Expand Down
2 changes: 1 addition & 1 deletion src/archive/metainfo/zk/lang-addon.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@

<version>
<version-class>org.zkoss.theme.atlantic.Version</version-class>
<version-uid>9.6.3</version-uid>
<version-uid>9.6.4</version-uid>
</version>
</language-addon>
7 changes: 4 additions & 3 deletions src/archive/web/js/zul/layout/less/borderlayout.less
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -154,9 +158,6 @@
overflow: hidden;
line-height: @iconHeight;
position: absolute;

.transform('rotate(90deg)');
.applyCSS3('transform-origin', 'left bottom');
}
}
.z-north-splitter,
Expand Down
2 changes: 1 addition & 1 deletion src/org/zkoss/theme/atlantic/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
9.0.0
9.6.3
9.6.4
10 changes: 10 additions & 0 deletions zkdoc/release-note
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
Atlantic 9.6.4
* Features:

* Bugs:

* Upgrade Notes:

--------
Atlantic 9.6.3
Oct 25, 2022
* Features:

* Bugs:
ZK-5253: title of borderlayout north/south shouldn't rotate 90 degrees

* Upgrade Notes:

Expand Down