Merge branch 'develop' of https://github.com/Timmlion/KJ2024 into dev…

…elop
Timmlion · Jan 28, 2024 · dc9a659 · dc9a659
2 parents 89337e2 + a1d417a
commit dc9a659
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/client/index.html b/client/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport"
           content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
-    <title>Meme: The Gathering</title>
+    <title >Meme: The Gathering</title>
     <script src="//cdnjs.cloudflare.com/ajax/libs/microsoft-signalr/3.1.9/signalr.min.js"></script>
     <script src="//code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo="
             crossorigin="anonymous"></script>
@@ -13,7 +13,7 @@
 </head>
 <body>
 <div id="lobby">
-    <h1>Meme: The Gathering</h1>
+    <h1 class="rotating-text">Meme: The Gathering</h1>
     <div id="games-list"></div>
     <input type="text" id="player-name-input" placeholder="Player Name"/>
     <input type="text" id="room-id-input" placeholder="Room ID"/>

diff --git a/client/static/css/style.css b/client/static/css/style.css
@@ -110,6 +110,11 @@ body {
     flex-direction: row;
 }
 
+#playersZones h {
+
+    display:inline;
+}
+
 #playersZones .player {
     background: linear-gradient(rgba(221,71,73, .6), rgba(18, 77, 94, 0.6) );
     max-width: 33%;
@@ -161,8 +166,9 @@ body {
     flex-wrap: nowrap;
     /*background-color:rgba(57, 64, 77, .8);*/
     padding: 15px;
-    overflow-x: scroll;
+    overflow-x: auto;
     max-height: 300px;
+    min-height: 300px;
 }
 
 #playerZone .playerData {
@@ -251,4 +257,18 @@ body {
     /*font-family: 'Honk', sans-serif;*/
     font-size: 24pt;
     color: white;
+}
+
+@keyframes rotateText {
+    from {
+        transform: rotate(0deg);
+    }
+    to {
+        transform: rotate(360deg);
+    }
+}
+
+.rotating-text {
+
+    animation: rotateText 2s linear; /* 'infinite' for looping */
 }
diff --git a/client/static/js/main.js b/client/static/js/main.js
@@ -226,6 +226,8 @@ function addToGameLog(message) {
     let li = document.createElement("li");
     li.innerHTML = message;
     document.querySelector("#gameLog ul").appendChild(li);
+    let logParent = document.querySelector("#gameLog");
+    logParent.scrollTop = logParent.scrollHeight;
 }
 
 function showLobbyErrorMessage(message) {