Merge pull request #210 from Troid-Tech/shoutbutton-height

Use client_button instead of objection_button

7 files changed, 64 insertions, 127 deletions

diff --git a/public/client.html b/public/client.html
index 79e3080..d8de174 100644
--- a/public/client.html
+++ b/public/client.html
@@ -187,13 +187,13 @@
 			<br>
 			<div id="character_options">
 				<div id="emote_options">
-					<button id="button_1" alt="Hold it!" class="objection_button" onclick="toggleShout(1)">Hold
+					<button id="button_1" alt="Hold it!" class="client_button" onclick="toggleShout(1)">Hold
 						it!</button>
-					<button id="button_2" alt="Objection!" class="objection_button"
+					<button id="button_2" alt="Objection!" class="client_button"
 						onclick="toggleShout(2)">Objection!</button>
-					<button id="button_3" alt="Take That!" class="objection_button" onclick="toggleShout(3)">Take
+					<button id="button_3" alt="Take That!" class="client_button" onclick="toggleShout(3)">Take
 						That!</button>
-					<button id="button_4" alt="Custom" class="objection_button" onclick="toggleShout(4)"
+					<button id="button_4" alt="Custom" class="client_button" onclick="toggleShout(4)"
 						style="display: none">
 						Custom</button>
 					<br>
diff --git a/webAO/styles/classic.css b/webAO/styles/classic.css
index b459cf7..241f8a1 100644
--- a/webAO/styles/classic.css
+++ b/webAO/styles/classic.css
@@ -1,13 +1,13 @@
 body {
-	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;
+	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 Cyrillic';
-		src: url('./igiari/igiari-cyrillic.ttf');
-	font-weight:normal;
-	font-style:normal;
+	font-family: 'Igiari Cyrillic';
+	src: url('./igiari/igiari-cyrillic.ttf');
+	font-weight: normal;
+	font-style: normal;
 }
 
 img {
@@ -19,7 +19,7 @@ hr {
 	height: 6px;
 	width: 100%;
 	background-color: #c6c6c6;
-	background: repeating-linear-gradient(to right,#f7f7f7, #f7f7f7 1px, #8c8c8c 1px, #8c8c8c 2px, #c6c6c6 2px, #c6c6c6 16px);
+	background: repeating-linear-gradient(to right, #f7f7f7, #f7f7f7 1px, #8c8c8c 1px, #8c8c8c 2px, #c6c6c6 2px, #c6c6c6 16px);
 	margin: 0;
 }
 
@@ -55,8 +55,13 @@ hr {
 }
 
 @keyframes shutter-effect {
-    0% { background-position: 0 0; }
-    100% { background-position: 0 4px; }
+	0% {
+		background-position: 0 0;
+	}
+
+	100% {
+		background-position: 0 4px;
+	}
 }
 
 #client_menu:after {
@@ -114,19 +119,6 @@ hr {
 	border-radius: 4px;
 }
 
-.objection_button {
-	min-width: 6em;
-	margin: 1px;
-	padding: 6px 2px;
-	clip-path: polygon(75% 0, 100% 50%, 100% 100%, 0 100%, 0 50%, 25% 0);
-	cursor: pointer;
-	text-align: center;
-	color: white;
-	background-color: #7b2900;
-	text-shadow: 0 0 4px #000;
-	border: #000 solid 1px;
-}
-
 #button_2 {
 	text-transform: capitalize;
 }
@@ -194,13 +186,13 @@ hr {
 }
 
 #client_ooclog {
-    background-color: #8b8b8b;
+	background-color: #8b8b8b;
 	color: #000;
 }
 
 #client_inputbox {
-    background-color: #6d6d6d;
-    color: #000;
+	background-color: #6d6d6d;
+	color: #000;
 }
 
 #client_iccontrols {
@@ -210,4 +202,4 @@ hr {
 #client_oocinput {
 	background-color: #575757;
 	color: #000;
-}
\ No newline at end of file
+}
diff --git a/webAO/styles/cyber.css b/webAO/styles/cyber.css
index 036938d..0863435 100644
--- a/webAO/styles/cyber.css
+++ b/webAO/styles/cyber.css
@@ -8,8 +8,13 @@ img {
 }
 
 @keyframes bg-scrolling {
-    0% { background-position: 0 0; }
-    100% { background-position: 5px 5px; }
+	0% {
+		background-position: 0 0;
+	}
+
+	100% {
+		background-position: 5px 5px;
+	}
 }
 
 @keyframes idling {
@@ -28,13 +33,13 @@ img {
 
 #evi_name {
 	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAFElEQVQImWNgYGDYjAVTV/A/w2YAfxQSe53wkNkAAAAASUVORK5CYII=) repeat;
-    animation: bg-scrolling 0.2s infinite linear;
+	animation: bg-scrolling 0.2s infinite linear;
 }
 
 #evi_desc {
 	flex: 1 auto;
 	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAFElEQVQImWNgYGDYjAVTV/A/w2YAfxQSe53wkNkAAAAASUVORK5CYII=) repeat;
-    animation: bg-scrolling 0.2s infinite linear;
+	animation: bg-scrolling 0.2s infinite linear;
 }
 
 .evi_icon {
@@ -49,20 +54,25 @@ img {
 
 #client_menu {
 	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAFElEQVQImWNgYGDYjAVTV/A/w2YAfxQSe53wkNkAAAAASUVORK5CYII=) repeat;
-    animation: bg-scrolling 0.2s infinite linear;
+	animation: bg-scrolling 0.2s infinite linear;
 	overflow-y: auto;
 	height: 100%;
 }
 
 @keyframes shutter-effect {
-    0% { background-position: 0 0; }
-    100% { background-position: 0 4px; }
+	0% {
+		background-position: 0 0;
+	}
+
+	100% {
+		background-position: 0 4px;
+	}
 }
 
 #client_iccontrols {
-    width: 100%;
-    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAFElEQVQImWNgYGDYjAVTV/A/w2YAfxQSe53wkNkAAAAASUVORK5CYII=) repeat;
-    animation: bg-scrolling 0.2s infinite linear;
+	width: 100%;
+	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAFElEQVQImWNgYGDYjAVTV/A/w2YAfxQSe53wkNkAAAAASUVORK5CYII=) repeat;
+	animation: bg-scrolling 0.2s infinite linear;
 }
 
 .menu_text {
@@ -93,21 +103,10 @@ img {
 	border: green solid 1px;
 }
 
-.objection_button {
-	min-width: 6em;
-	margin: 1px;
-	padding: 6px 2px;
-	cursor: pointer;
-	text-align: center;
-	color: black;
-	background-color: green;
-	border: greenyellow solid 1px;
-}
-
 #client_log {
 	color: white;
 	background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAFElEQVQImWNgYGDYjAVTV/A/w2YAfxQSe53wkNkAAAAASUVORK5CYII=) repeat;
-    animation: bg-scrolling 0.2s infinite linear;
+	animation: bg-scrolling 0.2s infinite linear;
 }
 
 #client_defense_hp {
@@ -139,7 +138,7 @@ img {
 	position: relative;
 	display: inline-block;
 	transition: 1s linear;
-    transition-property: width;
-    background-color: #00b800;
+	transition-property: width;
+	background-color: #00b800;
 	border-color: #84ff84 transparent #009c00 transparent;
-}
\ No newline at end of file
+}
diff --git a/webAO/styles/default.css b/webAO/styles/default.css
index 8a090cb..4fbc0d4 100644
--- a/webAO/styles/default.css
+++ b/webAO/styles/default.css
@@ -36,21 +36,6 @@ img[src$=".apng"] {
 	box-shadow: 1px 1px inset;
 }
 
-.objection_button {
-	margin: 1px;
-	padding: 7px 15px;
-	cursor: pointer;
-	text-align: center;
-	font-weight: bold;
-	color: white;
-	background-color: #7b2900;
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: #fff;
-	box-shadow: 1px 1px inset;
-}
-
 .evi_icon {
 	width: 70px;
 	min-width: 70px;
@@ -97,4 +82,4 @@ img[src$=".apng"] {
 	display: inline-block;
 	transition: 1s linear;
 	transition-property: width;
-}
\ No newline at end of file
+}
diff --git a/webAO/styles/soj.css b/webAO/styles/soj.css
index ffc3b42..9e277c4 100644
--- a/webAO/styles/soj.css
+++ b/webAO/styles/soj.css
@@ -36,19 +36,6 @@ body {
 	outline-offset: -1px;
 }
 
-.objection_button {
-	margin: 1px;
-	padding: 2px 15px;
-	cursor: pointer;
-	text-align: center;
-	font-weight: bold;
-	color: #fff;
-	background: linear-gradient(to bottom, #6b3c10, #422008);
-	border: 1px solid #211408;
-	outline: 1px solid #846129;
-	outline-offset: -1px;
-}
-
 #client_log {
 	position: relative;
 	height: 100%;
@@ -58,14 +45,14 @@ body {
 	overflow-wrap: break-word;
 	overflow-y: auto;
 	font-size: medium;
-	background-color: rgba(0,0,0,0.8);
+	background-color: rgba(0, 0, 0, 0.8);
 	text-align: start;
 	line-height: .85em;
 }
 
 #client_log>p {
 	line-height: 1.1em;
-	border-top: 1px solid rgba(255,255,255,0.2);
+	border-top: 1px solid rgba(255, 255, 255, 0.2);
 	border-bottom: 1px solid #000;
 }
 
@@ -73,11 +60,11 @@ body {
 	font-weight: initial;
 	padding-right: .35em;
 	text-shadow:
-	0 0 3px #39307b,
-	-1px -1px 0 #39307b,  
-	 1px -1px 0 #39307b,
-	 -1px 1px 0 #39307b,
-	  1px 1px 0 #39307b;
+		0 0 3px #39307b,
+		-1px -1px 0 #39307b,
+		1px -1px 0 #39307b,
+		-1px 1px 0 #39307b,
+		1px 1px 0 #39307b;
 }
 
 .iclog_text::before {
@@ -127,4 +114,4 @@ body {
 	display: inline-block;
 	transition: 1s linear;
 	transition-property: width;
-}
\ No newline at end of file
+}
diff --git a/webAO/styles/speen.css b/webAO/styles/speen.css
index e71ba05..f1677bb 100644
--- a/webAO/styles/speen.css
+++ b/webAO/styles/speen.css
@@ -3,7 +3,7 @@ body {
 }
 
 div * {
-	font-family: "Comic Sans MS" , Sans-Serif !important;
+	font-family: "Comic Sans MS", Sans-Serif !important;
 }
 
 img {
@@ -74,21 +74,6 @@ button:hover {
 	box-shadow: 1px 1px inset;
 }
 
-.objection_button {
-	margin: 1px;
-	padding: 7px 15px;
-	cursor: pointer;
-	text-align: center;
-	font-weight: bold;
-	color: white;
-	background-color: #7b2900;
-	border-radius: 3px;
-	border-style: solid;
-	border-width: 1px;
-	border-color: #fff;
-	box-shadow: 1px 1px inset;
-}
-
 .evi_icon {
 	width: 70px;
 	min-width: 70px;
@@ -135,4 +120,4 @@ button:hover {
 	display: inline-block;
 	transition: 1s linear;
 	transition-property: width;
-}
\ No newline at end of file
+}
diff --git a/webAO/styles/trilogy.css b/webAO/styles/trilogy.css
index 9848bb7..0d12a37 100644
--- a/webAO/styles/trilogy.css
+++ b/webAO/styles/trilogy.css
@@ -13,24 +13,13 @@ body {
 	border: 2px solid white;
 }
 
-.objection_button {
-	margin: 1px;
-	padding: 2px 15px;
-	cursor: pointer;
-	text-align: center;
-	font-weight: bold;
-	color: white;
-	background-color: #2781b2;
-	border: 2px solid white;
-}
-
 .client_button:hover {
-    outline:  1px solid #ffc31d;
-    outline-offset: 7px;
+	outline: 1px solid #ffc31d;
+	outline-offset: 7px;
 }
 
 .client_button:active {
-    background-color: #f2b91c;
+	background-color: #f2b91c;
 }
 
 #client_defense_hp {
@@ -72,13 +61,13 @@ body {
 }
 
 #client_menu {
-    background-image: url("trilogy_bg.png");
-    background-repeat: repeat;
+	background-image: url("trilogy_bg.png");
+	background-repeat: repeat;
 }
 
 #client_iccontrols {
-    background-image: url("trilogy_bg.png");
-    background-repeat: repeat;
+	background-image: url("trilogy_bg.png");
+	background-repeat: repeat;
 }
 
 .evi_icon {
@@ -86,4 +75,4 @@ body {
 	border: 0.1em solid #f8f5f2;
 	outline: 0.2em solid #2988bc;
 	outline-offset: -0.2em;
-}
\ No newline at end of file
+}