Bump engine.io and socket.io

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 [email protected].

pom.xml

@@ -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>

src/archive/metainfo/zk/config.xml

@@ -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>

src/archive/metainfo/zk/lang-addon.xml

@@ -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>

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,

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('<c:if test="${not empty c:property(@{browserDefault})}">${".z-page "}</c:if>');
+@{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('<c:if test="${empty c:property(@{browserDefault})}">');
 html {
   font-size: 100%;
   -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
 }
+e('</c:if>');
 // 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
@@ -92,61 +95,62 @@ img {
 }
 
 // Prevent max-width from affecting Google Maps
-#map_canvas img,
-.google-maps img {
+.google-maps img,
+#map_canvas img {
   max-width: none;
 }
 
 // Forms
 // -------------------------
 
 // 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
 }
@@ -199,7 +203,7 @@ textarea {
   }
 
   img {
-  	// Potix: this style will make img invisible in ie8
+    // Potix: this style will make img invisible in ie8
     //	max-width: 100% !important;    
   }
 

src/archive/web/zul/less/norm.less

@@ -1,9 +1,11 @@
 @import "~./zul/less/_header.less";
 @import "~./zul/less/_reset.less";
 
+e('<c:if test="${empty c:property(@{browserDefault})}">');
 html, body {
 	height: 100%;
 }
+e('</c:if>');
 
 // 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 @baseBorderColor;
 	.borderRadius(0);
 	margin: 0 2px; 
 	padding: 0;
 }
 
-legend {
+@{browserDefaultPrefix}legend {
 	border: 0;
 	padding: 0; 
 }
@@ -53,7 +55,6 @@ legend {
 		border: 0;
 	}
 }
-@browserDefault: "'org.zkoss.zul.theme.browserDefault'";
 e('<c:if test="${empty c:property(@{browserDefault})}">');
 body {
 	margin: 0;
@@ -152,12 +153,12 @@ e('</c:if>');
 }
 
 //radio, radiogroup
-input[type="radio"] {
+@{browserDefaultPrefix}input[type="radio"] {
 	-webkit-appearance: radio;
 	-moz-appearance: radio;
 	margin: 0 2px 4px;
 }
-input[type="checkbox"] {
+@{browserDefaultPrefix}input[type="checkbox"] {
 	-webkit-appearance: checkbox;
 	-moz-appearance: checkbox;
 	margin: 0 2px 4px;

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";
 }

version

@@ -1,2 +1,2 @@
 9.0.0
-9.6.3
+9.6.4

zkdoc/release-note

@@ -1,7 +1,18 @@
+Atlantic 9.6.4
+* Features:
+
+* Bugs:
+  ZK-5061: ZK Embedded loading default ZK styles causes style changes to the outer page
+
+* 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: