Merge pull request #21 from AttorneyOnline/resizing-fix

Resizing fix

4 files changed, 15 insertions, 24 deletions

diff --git a/webAO/client.css b/webAO/client.css
index bb5822b..ade55c7 100644
--- a/webAO/client.css
+++ b/webAO/client.css
@@ -84,7 +84,7 @@ img {
 	left: 0;
 	width: 100%;
 	height: 100%;
-	overflow-y: scroll;
+	overflow-y: auto;
 	justify-content: center;
 	align-items: center;
 	vertical-align: middle;
@@ -110,12 +110,10 @@ img {
 	border: 1px solid black;
 }
 
-#client_wrapper {
-	background-color: #888888;
-	overflow: auto;
-	overflow-y: hidden;
-	min-width: 256px;
-	resize: horizontal;
+#client_icwrapper {
+	overflow-x: hidden;
+	overflow-y: auto;
+	height: 100%;
 }
 
 @media (max-width: 360px) {
@@ -190,14 +188,6 @@ img {
 	left: 0;
 }
 
-#client_background {
-	position: absolute;
-	background-color: transparent;
-	width: 100%;
-	height: auto;
-	padding-bottom: 75%;
-}
-
 #client_name {
 	display: none;
 	height: 7%;
@@ -269,7 +259,7 @@ img {
 	word-break: keep-all;
 	word-wrap: break-word;
 	overflow-wrap: break-word;
-	overflow-y: scroll;
+	overflow-y: auto;
 	font-size: medium;
 	background-color: #242424;
 	text-align: start;
@@ -298,7 +288,7 @@ img {
 	font-family: "Source Code Pro", "Consolas", monospace;
 	font-size: small;
 	overflow-wrap: break-word;
-	overflow-y: scroll;
+	overflow-y: auto;
 	text-rendering: optimizelegibility;
 	resize: none;
 	flex: 1 1 auto;
@@ -458,6 +448,11 @@ img {
 	margin-right: -50%;
 }
 
+#client_menu {
+	overflow-y: auto;
+	height: 100%;
+}
+
 .menu_content {
 	margin: 15px 15px;
 	display: none;
diff --git a/webAO/client.html b/webAO/client.html
index 5af891b..2216666 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -22,7 +22,7 @@
 
 <template id="client_wrapper">
 	<meta name="frame-title" lang="en" content="Game">
-	<div id="client_background"></div>
+	<div id="client_icwrapper">
 	<div id="client_gamewindow">
 		<img id="client_court" alt="Courtroom background" onerror="imgError(this);">
 		<img id="client_char" onerror="imgError(this);">
@@ -114,6 +114,7 @@
 			No actions available for this role.
 		</span>
 	</fieldset>
+	</div>
 </template>
 
 <template id="mainmenu">
diff --git a/webAO/client.js b/webAO/client.js
index 8a5ddfb..d97cb2d 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -1087,7 +1087,6 @@ class Viewport {
 		const chatBox = document.getElementById("client_chat");
 		const charSprite = document.getElementById("client_char");
 		const eviBox = document.getElementById("client_evi");
-		const background = document.getElementById("client_background");
 		const shoutSprite = document.getElementById("client_shout");
 		const chatBoxInner = document.getElementById("client_inner_chat");
 
@@ -1103,8 +1102,6 @@ class Viewport {
 		}
 
 		if (this.chatmsg.isnew) {
-			// Reset screen background
-			background.style.backgroundColor = "transparent";
 			// Hide message and evidence window
 			nameBox.style.display = "none";
 			chatBox.style.display = "none";
@@ -1142,7 +1139,6 @@ class Viewport {
 				});
 			} else if (this.chatmsg.flash === 1) {
 				// Flash screen
-				background.style.backgroundColor = "white";
 				this.sfxaudio.pause();
 				this.sfxplayed = 1;
 				this.sfxaudio.src = AO_HOST + "sounds/general/sfx-realization.wav";
diff --git a/webAO/golden/css/goldenlayout.css b/webAO/golden/css/goldenlayout.css
index 72aa38d..ecb0d6b 100644
--- a/webAO/golden/css/goldenlayout.css
+++ b/webAO/golden/css/goldenlayout.css
@@ -42,8 +42,7 @@ body {
   float: left;
 }
 .lm_content {
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow: hidden;
   position: relative;
 }
 .lm_dragging,