Merge branch 'master' into fix-pipeline

9 files changed, 23 insertions, 7 deletions

diff --git a/webAO/styles/chatbox/chat999.css b/webAO/styles/chatbox/999.css
index de20d28..de20d28 100644
--- a/webAO/styles/chatbox/chat999.css
+++ b/webAO/styles/chatbox/999.css
diff --git a/webAO/styles/chatbox/chatboxes.js b/webAO/styles/chatbox/chatboxes.js
index 0e0367f..bc73109 100644
--- a/webAO/styles/chatbox/chatboxes.js
+++ b/webAO/styles/chatbox/chatboxes.js
@@ -1,21 +1,21 @@
 export default [
   'aa',
   'acww',
-  'chatdd',
+  'dd',
   'dgs',
-  'chatplvsaa',
+  'plvsaa',
   'trilogy',
-  'chatfuture',
+  'future',
   'legacy',
   'ddlc',
   'dr1',
-  'chatdr2',
+  'dr2',
   'drv3',
   'drae',
-  'chatp3',
+  'p3',
   'p4',
   'p5',
-  'chat999',
+  '999',
   'halla',
   'homestuck',
   'key',
diff --git a/webAO/styles/chatbox/chatdd.css b/webAO/styles/chatbox/dd.css
index d1561a4..d1561a4 100644
--- a/webAO/styles/chatbox/chatdd.css
+++ b/webAO/styles/chatbox/dd.css
diff --git a/webAO/styles/chatbox/chatdr2.css b/webAO/styles/chatbox/dr2.css
index 59b11dc..c6701d1 100644
--- a/webAO/styles/chatbox/chatdr2.css
+++ b/webAO/styles/chatbox/dr2.css
@@ -123,5 +123,9 @@
 }
 
 #client_trackstatus {
-	display: fuck;
+	display: block;
+}
+
+#client_clock {
+	display: none;
 }
\ No newline at end of file
diff --git a/webAO/styles/chatbox/chatfuture.css b/webAO/styles/chatbox/future.css
index cd638f4..cd638f4 100644
--- a/webAO/styles/chatbox/chatfuture.css
+++ b/webAO/styles/chatbox/future.css
diff --git a/webAO/styles/chatbox/chatp3.css b/webAO/styles/chatbox/p3.css
index 8c6a39d..c9234b6 100644
--- a/webAO/styles/chatbox/chatp3.css
+++ b/webAO/styles/chatbox/p3.css
@@ -114,4 +114,8 @@
 
 #client_trackstatus {
 	display: none;
+}
+
+#client_clock {
+	display: none;
 }
\ No newline at end of file
diff --git a/webAO/styles/chatbox/p4.css b/webAO/styles/chatbox/p4.css
index 7389fae..e31ffe7 100644
--- a/webAO/styles/chatbox/p4.css
+++ b/webAO/styles/chatbox/p4.css
@@ -112,4 +112,8 @@
 
 #client_trackstatus {
 	display: none;
+}
+
+#client_clock {
+	display: none;
 }
\ No newline at end of file
diff --git a/webAO/styles/chatbox/p5.css b/webAO/styles/chatbox/p5.css
index da27529..112c521 100644
--- a/webAO/styles/chatbox/p5.css
+++ b/webAO/styles/chatbox/p5.css
@@ -108,4 +108,8 @@
 
 #client_trackstatus {
 	display: none;
+}
+
+#client_clock {
+	display: none;
 }
\ No newline at end of file
diff --git a/webAO/styles/chatbox/chatplvsaa.css b/webAO/styles/chatbox/plvsaa.css
index a656e9b..a656e9b 100644
--- a/webAO/styles/chatbox/chatplvsaa.css
+++ b/webAO/styles/chatbox/plvsaa.css