From e012013587a05c5ee4fe4f3558bf1ef6d2ac3ff4 Mon Sep 17 00:00:00 2001
From: Alberto Xamin <alberto@xamin.it>
Date: Mon, 23 Nov 2020 14:39:04 +0100
Subject: [PATCH] chat and css fix

---
 frontend/src/App.vue               | 3 ---
 frontend/src/components/Chat.vue   | 8 ++------
 frontend/src/components/Player.vue | 7 ++++---
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 0a6b357..1c2f937 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -142,9 +142,6 @@ export default {
 h1,h2,h3,h4,p,span{
 	font-family: Avenir, Helvetica, Arial, sans-serif;
 }
-p {
-  font-size: 2vmin;
-}
 .center-stuff {
 	margin-left: auto;
 	margin-right: auto;
diff --git a/frontend/src/components/Chat.vue b/frontend/src/components/Chat.vue
index 1e77dec..12fef7b 100644
--- a/frontend/src/components/Chat.vue
+++ b/frontend/src/components/Chat.vue
@@ -22,12 +22,8 @@ export default {
 	sockets: {
 		chat_message(msg) {
 			this.messages.push(msg)
-			// let container = this.$el.querySelector("#chatbox");
-			// container.scrollTop = container.scrollHeight;
-			const el = this.$el.getElementsByClassName('end')[0];
-			if (el) {
-				el.scrollIntoView();
-			}
+			let container = this.$el.querySelector("#chatbox");
+			container.scrollTop = container.scrollHeight;
 		},
 	},
 	methods: {
diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue
index 7c82155..acc6256 100644
--- a/frontend/src/components/Player.vue
+++ b/frontend/src/components/Player.vue
@@ -4,8 +4,8 @@
 		<button v-if="canEndTurn" @click="end_turn">Termina Turno</button>
 		<div class="equipment-slot">
 			<Card v-if="my_role" :card="my_role" class="back"/>
-			<Card v-if="character" :card="character"/>
-			<transition-group name="list" tag="div" style="margin: 0 0 0 10pt;">
+			<Card v-if="character" :card="character" style="margin-left: -30pt;margin-right: 0pt;"/>
+			<transition-group name="list" tag="div" style="margin: 0 0 0 10pt; display:flex;">
 				<Card v-for="card in equipment" v-bind:key="card.name+card.number" :card="card" />
 			</transition-group>
 		</div>
@@ -224,9 +224,10 @@ export default {
 	margin-right:35pt;
 	margin-top:-0.5pt;
 }
-.equipment-slot, .equipment-slot>div {
+.equipment-slot {
 	display:flex;
 	margin: 10pt 0pt;
+	overflow:auto;
 }
 .turn-notify {
 	pointer-events: none;