Merge branch 'main' into tournament-info

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     name: 'Release'
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup NodeJS
         uses: actions/setup-node@v3

frontend/gfx/ingame.css

@@ -798,14 +798,19 @@ body {
 .sb-logo {
   width: 50px;
   aspect-ratio: 1;
-  visibility: hidden;
+  object-fit: contain;
+  display: none;
 }
 
 .sb-blue .sb-logo {
-  margin-right: 25px;
+  margin-top: -5px;
+  margin-left: 15px;
+  margin-right: 20px;
 }
 .sb-red .sb-logo {
-  margin-left: 25px;
+  margin-left: 20px;
+  margin-top: -5px;
+  margin-right: 15px;
 }
 
 .sb-score {

frontend/gfx/ingame.html

@@ -43,7 +43,7 @@ <h2 class="timer">3:00</h2>
       <div class="sb-team sb-blue">
         <div class="sb-team-info">
           <div class="sb-score sb-score-blue"></div>
-          <img src="/pages/op-module-teams/img/" alt="" class="sb-logo">
+          <img src="" alt="" class="sb-logo">
           <h3 class="sb-tag">Tag</h3>
           <h4 class="sb-standing">0-0</h4>
         </div>
@@ -76,7 +76,7 @@ <h2 class="sb-time">00:00</h2>
       <div class="sb-team sb-red">
         <div class="sb-team-info">
           <div class="sb-score sb-score-red"></div>
-          <img src="/pages/op-module-teams/img/" alt="" class="sb-logo">
+          <img src="" alt="" class="sb-logo">
           <h3 class="sb-tag">Tag</h3>
           <h4 class="sb-standing">0-0</h4>
         </div>

frontend/gfx/ingame.js

@@ -440,21 +440,23 @@ const roundOfMap = {
 function changeColors(e) {
   sbBlueTag.innerText = e.teams.blueTeam?.tag || 'Tag'
   sbRedTag.innerText = e.teams.redTeam?.tag || 'Tag'
-  sbBlueLogo.style.visibility = `hidden`
-  sbRedLogo.style.visibility = `hidden`
+  sbBlueLogo.style.display = `none`
+  sbRedLogo.style.display = `none`
   sbBlueStanding.innerText = e.teams.blueTeam?.standing || ''
   sbRedStanding.innerText = e.teams.redTeam?.standing || ''
-  if(e.teams.blueTeam?.logo) {
+
+  roundOfSpan.textContent = e.roundOf <= 8 ? roundOfMap[e.roundOf] : `Round of ${e.roundOf}`
+  nameSpan.textContent = e.tournamentName
+  resizeText(tournamentDiv)
+
+  if(e.teams.blueTeam?.logo !== undefined && e.teams.blueTeam?.logo !== '') {
     sbBlueLogo.src = `/pages/op-module-teams/img/${e.teams.blueTeam.logo}`
-    sbBlueLogo.style.visibility = 'visible'
+    sbBlueLogo.style.display = 'block'
   }
-  if(e.teams.redTeam?.logo) {
+  if(e.teams.redTeam?.logo !== undefined && e.teams.redTeam?.logo !== '') {
     sbRedLogo.src = `/pages/op-module-teams/img/${e.teams.redTeam.logo}`
-    sbRedLogo.style.visibility = 'visible'
+    sbRedLogo.style.display = 'block'
   }
-  roundOfSpan.textContent = e.roundOf <= 8 ? roundOfMap[e.roundOf] : `Round of ${e.roundOf}`
-  nameSpan.textContent = e.tournamentName
-  resizeText(tournamentDiv)
 
   sbBlueScore.innerHTML = ''
   sbRedScore.innerHTML = ''

package.json

@@ -1,6 +1,6 @@
 {
     "name": "module-league-in-game",
-    "version": "5.3.0",
+    "version": "5.4.0",
     "description": "Module to display in-game information",
     "author": "RCVolus",
     "license": "MIT",