diff options
| author | stonedDiscord <Tukz@gmx.de> | 2021-02-08 00:32:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-08 00:32:08 +0100 |
| commit | 891bca54f8ed848d180a716055c21af19046ef71 (patch) | |
| tree | e3bff5519339280c14086324378ef70362c9b555 | |
| parent | 9597d50f00764749636d14c92055c7cfea76ff52 (diff) | |
| parent | cbd34433530304845c80d48dbf4c39679eb23e1e (diff) | |
Merge pull request #78 from craftxbox/patch-1
Stop main game panel from scrolling.
| -rw-r--r-- | webAO/client.html | 22 | ||||
| -rw-r--r-- | webAO/styles/client.css | 11 |
2 files changed, 19 insertions, 14 deletions
diff --git a/webAO/client.html b/webAO/client.html index b5bf968..1b6b9c2 100644 --- a/webAO/client.html +++ b/webAO/client.html @@ -102,18 +102,18 @@ <div id="client_trackstatus" style="display: none;"><p id="client_trackstatustext">None</p></div> </div> </div> + <input id="client_inputbox" class="long" type="text" onkeypress="onEnter(event)" + placeholder="Say something…" autocomplete="off"> + <div id="client_bars"> + <span id="client_defense_hp" class="health-box"> + <div class="health-bar"></div> + </span> + <span id="client_prosecutor_hp" class="health-box"> + <div class="health-bar"></div> + </span> + </div> <div id="client_iccontrols"> - <input id="client_inputbox" class="long" type="text" onkeypress="onEnter(event)" - placeholder="Say something…" autocomplete="off"> <meta name="frame-title" lang="en" content="miscellaneous"> - <div id="client_bars"> - <span id="client_defense_hp" class="health-box"> - <div class="health-bar"></div> - </span> - <span id="client_prosecutor_hp" class="health-box"> - <div class="health-bar"></div> - </span> - </div> <div id="client_emo"> </div> <br> @@ -524,4 +524,4 @@ </select> </template> -</html>
\ No newline at end of file +</html> diff --git a/webAO/styles/client.css b/webAO/styles/client.css index 99381ec..b86e188 100644 --- a/webAO/styles/client.css +++ b/webAO/styles/client.css @@ -115,11 +115,16 @@ } #client_icwrapper { - overflow-x: hidden; - overflow-y: auto; + overflow: hidden; + display:flex; + flex-flow: column nowrap; height: 100%; } +#client_iccontrols { + overflow-y:auto; +} + @keyframes shake { 0%, @@ -616,4 +621,4 @@ .hrtext:after { left: 0.5em; margin-right: -50%; -}
\ No newline at end of file +} |