aboutsummaryrefslogtreecommitdiff
path: root/webAO
diff options
context:
space:
mode:
authorsD <stoned@derpymail.org>2020-02-12 15:27:16 +0100
committersD <stoned@derpymail.org>2020-02-12 15:27:16 +0100
commita0f20ed0a30000d25df982466adf5113fb06c772 (patch)
treec085c05c8956dd8ff4d7ba55ce776b0228a5a178 /webAO
parentb52afe4fbd3f64d75c1364314abf7813baa4dca0 (diff)
parent759a4905f6d6bcf59a5d503cc99262285046a5d5 (diff)
Merge branch 'master' into new_chatbox
Diffstat (limited to 'webAO')
-rw-r--r--webAO/client.css2
-rw-r--r--webAO/client.html47
2 files changed, 25 insertions, 24 deletions
diff --git a/webAO/client.css b/webAO/client.css
index dc3ddec..7458f47 100644
--- a/webAO/client.css
+++ b/webAO/client.css
@@ -260,7 +260,7 @@ img {
word-break: keep-all;
word-wrap: break-word;
overflow-wrap: break-word;
- text-align: start;
+ text-align: left;
overflow: hidden;
scroll-behavior: smooth;
}
diff --git a/webAO/client.html b/webAO/client.html
index c634bbe..0204560 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -5,7 +5,8 @@
<title>Attorney Online session</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="stylesheet" type="text/css" href="client.css?v=1.0.0">
+ <link rel="stylesheet" type="text/css" href="client.css?v=1.0.0" id="client_stylesheet">
+ <link rel="stylesheet" type="text/css" href="default.css?v=1.0.0" id="client_theme">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<link type="text/css" rel="stylesheet" href="golden/css/goldenlayout.css" />
<link type="text/css" rel="stylesheet"
@@ -16,6 +17,28 @@
<script src="client.b.js?v=1.0.0"></script>
</head>
+<body>
+ <span id="sound"></span>
+ <div id="here"></div>
+ <div id="client_loading">
+ <h1 id="client_loadingtext">Loading</h1>
+ <button class="client_reconnect" onclick="ReconnectButton()">Reconnect</button>
+ </div>
+ <div id="client_charselect">
+ <div id="client_chartable_container">
+ <table id="client_chartable"></table>
+ <button onclick="pickChar(1001)">Spectate</button>
+ </div>
+ </div>
+ <div id="client_error" class="error" style="display: none">
+ <h1 id="client_errortext">You were disconnected from the server.</h1>
+ <p>Code:
+ <span id="error_id">(none)</span>
+ </p>
+ <button class="client_reconnect" onclick="ReconnectButton()">Reconnect</button>
+ </div>
+</body>
+
<template id="client_wrapper">
<meta name="frame-title" lang="en" content="Game">
<div id="client_icwrapper">
@@ -331,26 +354,4 @@
</select>
</template>
-<body>
- <span id="sound"></span>
- <div id="here"></div>
- <div id="client_loading">
- <h1 id="client_loadingtext">Loading</h1>
- <button class="client_reconnect" onclick="ReconnectButton()">Reconnect</button>
- </div>
- <div id="client_charselect">
- <div id="client_chartable_container">
- <table id="client_chartable"></table>
- <button onclick="pickChar(1001)">Spectate</button>
- </div>
- </div>
- <div id="client_error" class="error" style="display: none">
- <h1 id="client_errortext">You were disconnected from the server.</h1>
- <p>Code:
- <span id="error_id">(none)</span>
- </p>
- <button class="client_reconnect" onclick="ReconnectButton()">Reconnect</button>
- </div>
-</body>
-
</html>