Merge branch 'master' into objection_maker

9 files changed, 53 insertions, 63 deletions

diff --git a/webAO/styles/chatbox/aa.css b/webAO/styles/chatbox/aa.css
index 434c33a..55a501e 100644
--- a/webAO/styles/chatbox/aa.css
+++ b/webAO/styles/chatbox/aa.css
@@ -33,23 +33,17 @@
 /* Webfont CSS setup for Igiari by Caveras */
 
 @font-face {
-	font-family:'Igiari';
-		src:url('../igiari/Igiari.eot');
-		src:url('../igiari/Igiari.eot?#iefix') format('embedded-opentype'),
-				url('../igiari/Igiari.woff') format('woff'),
-				url('../igiari/Igiari.ttf') format('truetype'),
-				url('../igiari/Igiari.svg#Igiari') format('svg');
+	font-family:'Igiari Cyrillic';
+		src: url('../igiari/igiari-cyrillic.ttf');
 	font-weight:normal;
 	font-style:normal;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-	@font-face {
-		font-family:'Igiari';
-		src: url('../igiari/Igiari.svg') format('svg');
-		font-weight:normal;
-		font-style:normal;
-	}
+@font-face {
+	font-family:'Ace Name';
+		src: url('./ace-name.ttf');
+	font-weight:normal;
+	font-style:normal;
 }
 
 #client_chatcontainer {
@@ -60,7 +54,6 @@
 	height: 40%;
 	width: 100%;
 	filter: none;
-	font-family: "Igiari", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi", sans-serif;
 }
 
 #client_name {
@@ -70,23 +63,26 @@
 	top: 1%;
 	height: 13%;
 	min-width: 3.25em;	
-	font-size: 1.1em;
-	background: rgba(56, 56, 163, 0.5);
+	font-size: 0.8em;
+	background: rgba(60, 85, 255, 0.4);
 	box-shadow: 0.075em 0.075em rgba(0, 56, 163, 0.5) inset;
 	margin: 0;
-	padding: 0 2%;
+	padding-top: 0.4%;
+	padding-left: 1.955%;
+	padding-right: 1.955%;
 	border-color: rgba(255, 255, 255, 0.5);
 	border-style: ridge groove groove ridge;
 	border-width: 0.2em;
-	border-radius: 0.2em;	
+	border-radius: 0.3em;	
 	z-index: 1;
+	font-family: "Ace Name", "Igiari Cyrillic", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi", sans-serif;
 }
 
 #client_inner_name {
 	text-justify: distribute;
-	letter-spacing: 0.075em;
 	line-height: 100%;
 	margin: 0;
+	margin-top: 2.75%;
 }
 
 #client_chat {
@@ -98,17 +94,18 @@
 	width: calc(100% - 0.25em);
 	height: 78%;
 	margin: auto;
-	border-color: rgba(255, 255, 255, 0.5);
+	border-color: rgba(255, 255, 255, 0.6);
 	border-style: ridge groove groove ridge;
 	border-width: 0.15em;
-	border-radius: 0.2em;
-	background-color: rgba(0, 0, 16, 0.5);
+	border-radius: 0.15em;
+	background-color: rgba(0, 0, 16, 0.55);
 	font-size: 1.6em;
 	word-break: keep-all;
 	overflow-wrap: break-word;
 	text-align: left;
 	overflow: hidden;
 	scroll-behavior: smooth;
+	font-family: "Igiari Cyrillic", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi", sans-serif;
 }
 
 #client_inner_chat {
diff --git a/webAO/styles/chatbox/ace-name.ttf b/webAO/styles/chatbox/ace-name.ttf
new file mode 100644
index 0000000..d5c6e88
--- /dev/null
+++ b/webAO/styles/chatbox/ace-name.ttf
diff --git a/webAO/styles/chatbox/chatdr2.css b/webAO/styles/chatbox/chatdr2.css
index 92af23c..b59b155 100644
--- a/webAO/styles/chatbox/chatdr2.css
+++ b/webAO/styles/chatbox/chatdr2.css
@@ -84,22 +84,6 @@
     z-index: 3;
 }
 
-#client_chat::before {
-    content: "";
-    position: absolute;
-
-    background-image: linear-gradient(45deg, rgba(0,0,0,0.1) 25%, rgba(255,255,255,0.1) 25%, rgba(255,255,255,0.1) 75%, rgba(0,0,0,0.1) 75%, rgba(0,0,0,0.1)),
-                        linear-gradient(45deg, rgba(0,0,0,0.1) 25%, rgba(255,255,255,0.1) 25%, rgba(255,255,255,0.1) 75%, rgba(0,0,0,0.1) 75%, rgba(0,0,0,0.1));
-    background-size: 2em 2em;
-    background-position: 0 0, 1em 1em;
-    transform: rotate(-10deg);
-    width: 250%;
-    height: 400%;
-    top: -100%;
-    left: -100%;
-    z-index: 2;
-  }
-
 #client_inner_chat {
     position: absolute;
 	padding: 2% 4%;
diff --git a/webAO/styles/chatbox/chatfuture.css b/webAO/styles/chatbox/chatfuture.css
index 7fc704f..ae206b0 100644
--- a/webAO/styles/chatbox/chatfuture.css
+++ b/webAO/styles/chatbox/chatfuture.css
@@ -31,11 +31,10 @@
 }
 
 @font-face {
-	font-family: 'ace_attorneyregular';
-	src: url('../ace-attorney.woff2') format('woff2'),
-		url('../ace-attorney.woff') format('woff');
-	font-weight: normal;
-	font-style: normal;
+	font-family:'Igiari Cyrillic';
+		src: url('../igiari/igiari-cyrillic.ttf');
+	font-weight:normal;
+	font-style:normal;
 }
 
 #client_chatcontainer {
@@ -46,7 +45,7 @@
 	height: 40%;
 	width: 100%;
 	filter: none;
-	font-family: "Ace Attorney", "ace_attorneyregular", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi", sans-serif;
+	font-family: "Igiari Cyrillic", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi", sans-serif;
 }
 
 #client_name {
diff --git a/webAO/styles/chatbox/dgs.css b/webAO/styles/chatbox/dgs.css
index 2e0ab79..65f72a3 100644
--- a/webAO/styles/chatbox/dgs.css
+++ b/webAO/styles/chatbox/dgs.css
@@ -38,6 +38,14 @@
 	src: local('Cabin Condensed'), local('CabinCondensed-Regular'), url(https://fonts.gstatic.com/s/cabincondensed/v13/nwpMtK6mNhBK2err_hqkYhHRqmwqZ-LY.woff2) format('woff2');
 }
 
+@font-face {
+	font-family: 'Bitter';
+	font-style: normal;
+	font-weight: 400;
+	font-display: swap;
+	src: local('Bitter Regular'), local('Bitter-Regular'), url(https://fonts.gstatic.com/s/bitter/v15/rax8HiqOu8IVPmn7cYxpPDk.woff2) format('woff2');
+  }
+
 #client_chatcontainer {
 	display: block;
 	position: absolute;
@@ -62,7 +70,7 @@
 	top: 0;
 	border-radius: 3px;
 	position: absolute;
-	font-family: "Times New Roman", serif;
+	font-family: "Bitter", "Times New Roman", serif;
 }
 
 #client_inner_name {
diff --git a/webAO/styles/classic.css b/webAO/styles/classic.css
index 87cdda7..90f39bc 100644
--- a/webAO/styles/classic.css
+++ b/webAO/styles/classic.css
@@ -1,29 +1,15 @@
 body {
-	font-family: "Igiari", "Ace Attorney", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi" , sans-serif;
+	font-family: "Igiari Cyrillic", "Ace Attorney", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi" , sans-serif;
 }
 
 /* Webfont CSS setup for Igiari by Caveras */
-
 @font-face {
-	font-family:'Igiari';
-		src:url('igiari/Igiari.eot');
-		src:url('igiari/Igiari.eot?#iefix') format('embedded-opentype'),
-				url('igiari/Igiari.woff') format('woff'),
-				url('igiari/Igiari.ttf') format('truetype'),
-				url('igiari/Igiari.svg#Igiari') format('svg');
+	font-family:'Igiari Cyrillic';
+		src: url('../igiari/igiari-cyrillic.ttf');
 	font-weight:normal;
 	font-style:normal;
 }
 
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-	@font-face {
-		font-family:'Igiari';
-		src: url('igiari/Igiari.svg') format('svg');
-		font-weight:normal;
-		font-style:normal;
-	}
-}
-
 img {
 	image-rendering: crisp-edges;
 	image-rendering: pixelated;
diff --git a/webAO/styles/client.css b/webAO/styles/client.css
index cecba80..99381ec 100644
--- a/webAO/styles/client.css
+++ b/webAO/styles/client.css
@@ -182,6 +182,14 @@
 	height: 100%;
 	width: 100%;
 	bottom: 0;
+}
+
+#client_pair_char>img {
+	position: absolute;
+	height: 100%;
+	width: 100%;
+	bottom: 0;
+	left: 0;
 	object-fit: cover;
 	object-position: 50% 0;
 }
@@ -192,6 +200,14 @@
 	width: 100%;
 	bottom: 0;
 	left: 0;
+}
+
+#client_char>img {
+	position: absolute;
+	height: 100%;
+	width: 100%;
+	bottom: 0;
+	left: 0;
 	object-fit: cover;
 	object-position: 50% 0;
 }
diff --git a/webAO/styles/default.css b/webAO/styles/default.css
index ecd2581..0d6fd21 100644
--- a/webAO/styles/default.css
+++ b/webAO/styles/default.css
@@ -1,5 +1,5 @@
 body {
-	font-family: "Ace Attorney", "MS PGothic", "MS UI Gothic", "MS Sans Serif", "Hiragino Maru Gothic Pro", "Mitra Mono", "Mukti Narrow", "Meera", "Khmer OS", "FreeSans", "Gargi" , sans-serif;
+	font-family: sans-serif;
 }
 
 img {
diff --git a/webAO/styles/igiari/igiari-cyrillic.ttf b/webAO/styles/igiari/igiari-cyrillic.ttf
new file mode 100644
index 0000000..a846a88
--- /dev/null
+++ b/webAO/styles/igiari/igiari-cyrillic.ttf