diff --git a/tournaments/models/round.py b/tournaments/models/round.py index b648912..e927699 100644 --- a/tournaments/models/round.py +++ b/tournaments/models/round.py @@ -180,7 +180,7 @@ class Round(SideStoreModel): matches=first_half_matches, round_id=self.id, round_index=self.index, - short_names=True + short_names=double_butterfly_mode ) return match_group diff --git a/tournaments/static/tournaments/css/broadcast.css b/tournaments/static/tournaments/css/broadcast.css index edc303c..7dde33f 100644 --- a/tournaments/static/tournaments/css/broadcast.css +++ b/tournaments/static/tournaments/css/broadcast.css @@ -140,7 +140,17 @@ body { .left-content.bubble-header.screen-size-overlay { display: flex; align-items: top; /* Vertically align items (logo and text) */ - height: 100px; /* Example height matching QR code */ + height: auto; /* Allow height to adjust based on content */ +} + +.left-content.bubble-header.screen-size-overlay .left-margin h1.club, +.left-content.bubble-header.screen-size-overlay .left-margin h1.event { + display: -webkit-box; + -webkit-line-clamp: 2; + -webkit-box-orient: vertical; + overflow: hidden; + text-overflow: ellipsis; + white-space: normal; /* Allow text to wrap */ } .logo { diff --git a/tournaments/static/tournaments/css/tournament_bracket.css b/tournaments/static/tournaments/css/tournament_bracket.css index 966bc12..917b631 100644 --- a/tournaments/static/tournaments/css/tournament_bracket.css +++ b/tournaments/static/tournaments/css/tournament_bracket.css @@ -34,6 +34,13 @@ gap: 40px; /* Increased to account for horizontal lines (20px on each side) */ position: relative; margin-bottom: 80px; +} + +.broadcast-mode .butterfly-bracket { + display: flex; + gap: 40px; /* Increased to account for horizontal lines (20px on each side) */ + position: relative; + margin-bottom: 80px; font-size: clamp(0.6em, 1vw, 1.2em) !important; } diff --git a/tournaments/static/tournaments/js/tournament_bracket.js b/tournaments/static/tournaments/js/tournament_bracket.js index 87bbba7..e604582 100644 --- a/tournaments/static/tournaments/js/tournament_bracket.js +++ b/tournaments/static/tournaments/js/tournament_bracket.js @@ -41,7 +41,11 @@ function renderBracket(options) { } const padding = 46 * roundTotalCount; // Account for some padding/margin const availableWidth = screenWidth - padding; - responsiveMatchWidth = Math.floor(availableWidth / roundTotalCount); + let responsiveMatchWidth = Math.min( + 365, + Math.max(365, Math.floor(availableWidth / roundTotalCount)), + ); + let topMargin = 0; if (isBroadcast) { responsiveMatchWidth = Math.min( @@ -49,7 +53,13 @@ function renderBracket(options) { Math.floor(availableWidth / roundTotalCount), ); - if (roundTotalCount < 5) { + if (roundTotalCount == 1) { + topMargin = 240; + } else if (roundTotalCount == 2) { + topMargin = 180; + } else if (roundTotalCount == 3) { + topMargin = 120; + } else if (roundTotalCount == 4) { topMargin = 60; } else { topMargin = 0; diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html b/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html index 3eba500..15d398b 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html @@ -42,16 +42,9 @@ color: white; padding: 20px; max-width: 40%; - font-size: 0.6em !important; + font-size: clamp(0.4em, 1vw, 1.2em) !important; z-index: 1000; /* Ensure it's on top of other elements */ } - .left-content.screen-size-overlay .left-margin, - .left-content.screen-size-overlay h1.club, - .left-content.screen-size-overlay h1.event { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; /* Prevent text from wrapping */ - } @@ -59,7 +52,7 @@
- +

{{ tournament.broadcast_event_display_name }}

Tableau {{ tournament.broadcast_display_name }}

diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_planning.html b/tournaments/templates/tournaments/broadcast/broadcasted_planning.html index bc1fc3f..3bc5396 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_planning.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_planning.html @@ -295,7 +295,7 @@