From 32642bed0223691448b04ca9d44af1649073ea81 Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Fri, 14 Jun 2024 15:05:44 +0200
Subject: [PATCH] Removes additional separator at the end of lists

---
 tournaments/static/tournaments/css/style.css  |  4 +++
 .../tournaments/broadcasted_group_stage.html  |  2 +-
 .../tournaments/broadcasted_match.html        |  2 +-
 .../tournaments/broadcasted_ranking.html      |  7 ++++-
 .../tournaments/broadcasted_rankings.html     |  2 +-
 .../tournaments/broadcasted_summon.html       | 24 ++++++++------
 .../tournaments/broadcasted_summons.html      | 31 ++++++++++++-------
 .../tournaments/group_stage_cell.html         |  6 +++-
 .../templates/tournaments/ranking_row.html    |  6 +++-
 .../templates/tournaments/team_row.html       |  6 +++-
 .../templates/tournaments/tournament_row.html |  5 ++-
 11 files changed, 67 insertions(+), 28 deletions(-)

diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css
index 37aa29f..26b7651 100644
--- a/tournaments/static/tournaments/css/style.css
+++ b/tournaments/static/tournaments/css/style.css
@@ -71,6 +71,10 @@ nav a {
     /* Adjust the horizontal spacing between <a> elements */
 }
 
+hr {
+    margin: 2px 0px;
+}
+
 /* a {
     color: #707070;
     padding: 8px 12px;
diff --git a/tournaments/templates/tournaments/broadcasted_group_stage.html b/tournaments/templates/tournaments/broadcasted_group_stage.html
index 1bf2df4..d43b92e 100644
--- a/tournaments/templates/tournaments/broadcasted_group_stage.html
+++ b/tournaments/templates/tournaments/broadcasted_group_stage.html
@@ -7,7 +7,7 @@
     <template x-for="i in group_stage.teams.length">
 
         <div>
-            <div class="flex dark-bottom-border">
+            <div class="flex">
 
                 <div class="flex-left">
                     <template x-for="name in group_stage.teams[i-1].names">
diff --git a/tournaments/templates/tournaments/broadcasted_match.html b/tournaments/templates/tournaments/broadcasted_match.html
index 0730f69..26d2c82 100644
--- a/tournaments/templates/tournaments/broadcasted_match.html
+++ b/tournaments/templates/tournaments/broadcasted_match.html
@@ -42,7 +42,7 @@
             </div>
 
              <div x-show="i === 1">
-                 <div class="bottom-border"></div>
+                 <hr/>
              </div>
 
          </div>
diff --git a/tournaments/templates/tournaments/broadcasted_ranking.html b/tournaments/templates/tournaments/broadcasted_ranking.html
index 7e9247b..f89ec96 100644
--- a/tournaments/templates/tournaments/broadcasted_ranking.html
+++ b/tournaments/templates/tournaments/broadcasted_ranking.html
@@ -1,6 +1,7 @@
 {% load static %}
 
-        <div class="table-row-3-colums-ranks bottom-border">
+    <div>
+        <div class="table-row-3-colums-ranks">
 
             <div class="table-cell"><div class="mybox center"><span x-text="ranking.formatted_ranking"></div></div>
             <div class="table-cell table-cell-large padding-left semibold">
@@ -12,3 +13,7 @@
 
             <div class="table-cell right horizontal-padding"><span x-text="ranking.points"></div>
         </div>
+        <div x-show="index < column.length - 1">
+            <hr/>
+        </div>
+    </div>
diff --git a/tournaments/templates/tournaments/broadcasted_rankings.html b/tournaments/templates/tournaments/broadcasted_rankings.html
index 4902cfd..e806847 100644
--- a/tournaments/templates/tournaments/broadcasted_rankings.html
+++ b/tournaments/templates/tournaments/broadcasted_rankings.html
@@ -56,7 +56,7 @@
                 <div class="cell medium-6 large-6 topblock my-block" x-show="active === i">
 
                     <div class="bubble">
-                        <template x-for="ranking in column" >
+                        <template x-for="(ranking, index) in column" >
 
                             {% include 'tournaments/broadcasted_ranking.html' %}
 
diff --git a/tournaments/templates/tournaments/broadcasted_summon.html b/tournaments/templates/tournaments/broadcasted_summon.html
index 103372f..136657c 100644
--- a/tournaments/templates/tournaments/broadcasted_summon.html
+++ b/tournaments/templates/tournaments/broadcasted_summon.html
@@ -1,15 +1,21 @@
 <div class="bubble">
-    <template x-for="summon in column" >
-        <div class="table-row-4-colums bottom-border">
-            <div class="table-cell table-cell-large semibold">
-                <template x-for="i in summon.names.length">
-                    <div x-text="summon.names[i-1]"></div>
-                </template>
+    <template x-for="(summon, index) in column" >
+        <div>
+            <div class="table-row-4-colums">
+                <div class="table-cell table-cell-large semibold">
+                    <template x-for="i in summon.names.length">
+                        <div x-text="summon.names[i-1]"></div>
+                    </template>
+                </div>
+
+                <div class="table-cell center"><span x-text="summon.weight"></span></div>
+                <div class="table-cell large center"><span x-text="summon.date"></span></div>
+                <div class="table-cell"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
             </div>
 
-            <div class="table-cell center"><span x-text="summon.weight"></span></div>
-            <div class="table-cell large center"><span x-text="summon.date"></span></div>
-            <div class="table-cell"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
+            <div x-show="index < column.length - 1">
+                <hr/>
+            </div>
         </div>
     </template>
 </div>
diff --git a/tournaments/templates/tournaments/broadcasted_summons.html b/tournaments/templates/tournaments/broadcasted_summons.html
index 01e64b6..6545128 100644
--- a/tournaments/templates/tournaments/broadcasted_summons.html
+++ b/tournaments/templates/tournaments/broadcasted_summons.html
@@ -55,21 +55,30 @@
             <template x-for="column in paginatedMatches[i-1]" >
                 <div class="cell medium-6 large-6 topblock my-block" x-show="active === i">
 
-                    <div class="bubble">
-                        <template x-for="summon in column" >
-                            <div class="table-row-4-colums bottom-border">
-                                <div class="table-cell table-cell-large semibold">
-                                    <template x-for="i in summon.names.length">
-                                        <div x-text="summon.names[i-1]"></div>
-                                    </template>
+                    {% include 'tournaments/broadcasted_summon.html' %}
+
+                    <!-- <div class="bubble">
+                        <template x-for="(summon, index) in column" >
+                            <div>
+                                <div class="table-row-4-colums">
+                                    <div class="table-cell table-cell-large semibold">
+                                        <template x-for="i in summon.names.length">
+                                            <div x-text="summon.names[i-1]"></div>
+                                        </template>
+                                    </div>
+
+                                    <div class="table-cell center"><span x-text="summon.weight"></span></div>
+                                    <div class="table-cell large center"><span x-text="summon.date"></span></div>
+                                    <div class="table-cell"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
                                 </div>
 
-                                <div class="table-cell center"><span x-text="summon.weight"></span></div>
-                                <div class="table-cell large center"><span x-text="summon.date"></span></div>
-                                <div class="table-cell"><div class="mybox center"><span x-text="summon.stage"></span></div></div>
+                                <div x-show="index < column.length - 1">
+                                    <hr/>
+                                </div>
                             </div>
+
                         </template>
-                    </div>
+                    </div> -->
                 </div>
             </template>
         </template>
diff --git a/tournaments/templates/tournaments/group_stage_cell.html b/tournaments/templates/tournaments/group_stage_cell.html
index 93733ac..d26407f 100644
--- a/tournaments/templates/tournaments/group_stage_cell.html
+++ b/tournaments/templates/tournaments/group_stage_cell.html
@@ -12,7 +12,7 @@
 
                 {% for team in group_stage.teams %}
 
-                <div class="flex dark-bottom-border">
+                <div class="flex">
                     <div class="flex-left">
                         {% for name in team.names %}
                         <div class="semibold {% if team.is_winner %}winner{% endif %}">
@@ -36,6 +36,10 @@
                     </div>
                 </div>
 
+                {% if not forloop.last %}
+                <div class="dark-bottom-border"></div>
+                {% endif %}
+
                 {% endfor %}
 
                 </div>
diff --git a/tournaments/templates/tournaments/ranking_row.html b/tournaments/templates/tournaments/ranking_row.html
index fefd21a..c32684c 100644
--- a/tournaments/templates/tournaments/ranking_row.html
+++ b/tournaments/templates/tournaments/ranking_row.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-        <div class="table-row-3-colums-ranks bottom-border">
+        <div class="table-row-3-colums-ranks">
 
             <div class="table-cell"><div class="mybox center">{{ ranking.formatted_ranking }}</div></div>
             <div class="table-cell table-cell-large padding-left semibold">
@@ -15,3 +15,7 @@
                 <div class="table-cell right horizontal-padding"></div>
             {% endif %}
         </div>
+
+        {% if not forloop.last %}
+        <hr/>
+        {% endif %}
diff --git a/tournaments/templates/tournaments/team_row.html b/tournaments/templates/tournaments/team_row.html
index 524a9e6..08ea0c1 100644
--- a/tournaments/templates/tournaments/team_row.html
+++ b/tournaments/templates/tournaments/team_row.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-        <div class="table-row-3-colums-teams bottom-border">
+        <div class="table-row-3-colums-teams">
 
             <div class="table-cell table-cell-large semibold">
                 {% for name in team.names %}
@@ -16,3 +16,7 @@
             {% endif %}
             <div class="table-cell "><div class="mybox center">{{ team.stage }}</div></div>
         </div>
+
+        {% if not forloop.last %}
+        <hr/>
+        {% endif %}
diff --git a/tournaments/templates/tournaments/tournament_row.html b/tournaments/templates/tournaments/tournament_row.html
index 8cd564f..869290c 100644
--- a/tournaments/templates/tournaments/tournament_row.html
+++ b/tournaments/templates/tournaments/tournament_row.html
@@ -1,5 +1,5 @@
         <a href="{% url 'tournament' tournament.id %}">
-            <div class="table-row-4-colums-tournament bottom-border vertical-padding">
+            <div class="table-row-4-colums-tournament vertical-padding">
                 <div class="tight table-cell">
                     <div class="large">{{ tournament.level }}</div>
                     <div class="small">{{ tournament.category }}</div>
@@ -33,3 +33,6 @@
                 </div>
             </div>
         </a>
+        {% if not forloop.last %}
+        <hr/>
+        {% endif %}