aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstonedDiscord <stoned@derpymail.org>2019-07-18 20:50:20 +0200
committerstonedDiscord <stoned@derpymail.org>2019-07-18 20:50:20 +0200
commit7496df4dbc7cb2f38f9b3130073b834712a15576 (patch)
treefdbecc86f1c89bf1be9cdd91b1b0004618838b6a
parent7e6409f36cb0f39b8974c737d7b81ccffb6c06f0 (diff)
Revert "Revert "Revert "remove deprecated client_background that was blocking the scrollbar somehow"""
This reverts commit b8f4c65312e8c8b1ccc081d59288e6d6a38b7911.
-rw-r--r--webAO/client.css8
-rw-r--r--webAO/client.html1
-rw-r--r--webAO/client.js4
3 files changed, 13 insertions, 0 deletions
diff --git a/webAO/client.css b/webAO/client.css
index a531921..c0e4a83 100644
--- a/webAO/client.css
+++ b/webAO/client.css
@@ -188,6 +188,14 @@ img {
left: 0;
}
+#client_background {
+ position: absolute;
+ background-color: transparent;
+ width: 100%;
+ height: auto;
+ padding-bottom: 75%;
+}
+
#client_name {
display: none;
height: 7%;
diff --git a/webAO/client.html b/webAO/client.html
index e66167b..be3997e 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -23,6 +23,7 @@
<template id="client_wrapper">
<meta name="frame-title" lang="en" content="Game">
<div id="client_icwrapper">
+ <div id="client_background"></div>
<div id="client_gamewindow">
<img id="client_court" alt="Courtroom background" onerror="imgError(this);">
<img id="client_char" onerror="imgError(this);">
diff --git a/webAO/client.js b/webAO/client.js
index d97cb2d..8a5ddfb 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -1087,6 +1087,7 @@ 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");
@@ -1102,6 +1103,8 @@ 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";
@@ -1139,6 +1142,7 @@ 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";