diff --git a/tournaments/static/tournaments/css/broadcast.css b/tournaments/static/tournaments/css/broadcast.css index a5d6d67..ffd1f78 100644 --- a/tournaments/static/tournaments/css/broadcast.css +++ b/tournaments/static/tournaments/css/broadcast.css @@ -19,7 +19,6 @@ body { padding: 20px; background-color: white; border-radius: 24px; - /* box-shadow: 0 0 0px 1px #fbead6; */ box-shadow: 0 0 0px 0px #fbead6; } diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css index 5ad4ca9..9aed836 100644 --- a/tournaments/static/tournaments/css/style.css +++ b/tournaments/static/tournaments/css/style.css @@ -25,7 +25,6 @@ body { box-sizing: border-box; height: 100%; - /* padding: 0; */ margin: 0px 0px 100px 0px; } @@ -68,14 +67,6 @@ nav { nav a { margin-right: 6px; - /* Adjust the horizontal spacing between elements */ -} - -hr { - margin: 2px 0px; -} - -/* a { color: #707070; padding: 8px 12px; background-color: #fae7ce; @@ -83,29 +74,22 @@ hr { text-decoration: none; font-size: 12px; font-weight: 600; -} */ +} + +hr { + margin: 2px 0px; +} .wrapper { margin: 0px 10px; } -@media print, -screen and (min-width: 40em) { +@media print, screen and (min-width: 40em) { .wrapper { margin: 0px 40px; } } -.mybox { - color: #707070; - padding: 8px 12px; - background-color: #fae7ce; - border-radius: 12px; - text-decoration: none; - font-size: 12px; - font-weight: 600; -} - table { border-collapse: collapse; margin: 5px 0px; @@ -124,6 +108,34 @@ tr { /* height: 40px; */ } +.orange { + color: #f39200; +} + +.mybox { + color: #707070; + padding: 8px 12px; + background-color: #fae7ce; + border-radius: 12px; + text-decoration: none; + font-size: 12px; + font-weight: 600; +} + +.large_button { + font-size: 16px; + display: inline-block; + font-family: "Montserrat-SemiBold"; + color: white; + padding: 15px; + background-color: #1b223a; + border-radius: 12px; + text-align: center; + text-decoration: none; + width: 240px; + word-wrap: break-word; +} + .beige { color: #fff7ed; } @@ -188,8 +200,8 @@ tr { } .logo { - height: 100px; - padding: 5px 10px; + height: 80px; + /* padding: 5px 10px; */ } .padding-bottom-small { @@ -208,10 +220,6 @@ tr { padding-left: 10px; } -.names { - /* width: 70%; */ -} - .team-names-box { height: 60px; } @@ -233,11 +241,7 @@ tr { display: flex; } -/* .score-span { - width: 30px; /* Fixed width for each score cell */ -} - -*/ .separator { +.separator { height: 1px; background-color: #707070; margin: 5px 0px; @@ -272,12 +276,6 @@ tr { padding: 10px 10px; } -/* @media print, screen and (min-width: 40em) { - .my-block { - padding: 10px 10px; - } -} */ - .red { background-color: red; } @@ -286,6 +284,10 @@ svg { border-radius: 16px; } +.padding20 { + padding: 20px; +} + .padding { padding: 100px; } @@ -326,7 +328,6 @@ h-margin { .inline { display: inline-block; - /* box-sizing: border-box; */ vertical-align: middle; } @@ -338,10 +339,6 @@ h-margin { margin: 0px 10px; } -.hpadding10 { - padding: 0px 10px; -} - .margin10 { margin: 10px; } @@ -379,20 +376,10 @@ h-margin { } .duration { - /* display:grid; */ - /* grid-template-columns: max-content max-content; */ width: 100%; background-color: #fcc; } -.alignleft { - text-align: left; -} - -.alignright { - text-align: right; -} - .clear { clear: both; } @@ -405,20 +392,12 @@ h-margin { margin-top: 10px; } -.top-margin20 { - margin-top: 20px; -} - .smatch { padding-top: 20px; width: 800px; margin: 0 auto; } -.right { - text-align: right; -} - .scontainer { display: flex; align-items: center; @@ -432,18 +411,6 @@ h-margin { padding: 8px 0px; } -.topmargin5 { - margin-top: 5px; -} - -.topmargin10 { - margin-top: 10px; -} - -.topmargin20 { - margin-top: 20px; -} - .tight { line-height: 1.1; } @@ -480,74 +447,6 @@ h-margin { width: 40px; } -.w15 { - width: 15%; -} - -.w20 { - width: 20%; -} - -.w25 { - width: 25%; -} - -.w30 { - width: 30%; -} - -.w40 { - width: 40%; -} - -.w50 { - width: 50%; -} - -.w60 { - width: 60%; -} - -.w70 { - width: 70%; -} - -.w80 { - width: 80%; -} - -.w100 { - width: 100%; -} - -.w20px { - width: 20px; -} - -.w30px { - width: 30px; -} - -.w40px { - width: 40px; -} - -.w60px { - width: 60px; -} - -.w70px { - width: 7px; -} - -.w80px { - width: 80px; -} - -.w100px { - width: 100px; -} - .table-row-1-colum { display: grid; grid-template-columns: 1px auto; @@ -612,7 +511,6 @@ h-margin { padding: 5px 0px; } - .table-row-3-colums-ranks { display: grid; grid-template-columns: 80px 1fr auto; @@ -640,8 +538,7 @@ h-margin { padding: 5px 0px; } -@media print, -screen and (min-width: 80em) { +@media print, screen and (min-width: 80em) { .table-row-4-colums { display: grid; grid-template-columns: 1px auto 50px 160px 180px; @@ -682,8 +579,7 @@ screen and (min-width: 80em) { display: block; } -@media print, -screen and (min-width: 80em) { +@media print, screen and (min-width: 80em) { .table-row-4-colums-tournament { grid-template-columns: 50px 1fr auto auto; } @@ -732,9 +628,6 @@ screen and (min-width: 80em) { padding: 5px 0px; } - - - #header { display: flex; justify-content: space-between; diff --git a/tournaments/templates/tournaments/base.html b/tournaments/templates/tournaments/base.html index 2add382..908ebd7 100644 --- a/tournaments/templates/tournaments/base.html +++ b/tournaments/templates/tournaments/base.html @@ -10,6 +10,7 @@ href="{% static 'tournaments/css/foundation.min.css' %}" /> +
-
diff --git a/tournaments/templates/tournaments/base_head.html b/tournaments/templates/tournaments/broadcast/base_head.html similarity index 87% rename from tournaments/templates/tournaments/base_head.html rename to tournaments/templates/tournaments/broadcast/base_head.html index ecd9bf0..5894f8a 100644 --- a/tournaments/templates/tournaments/base_head.html +++ b/tournaments/templates/tournaments/broadcast/base_head.html @@ -6,6 +6,7 @@ rel="stylesheet" href="{% static 'tournaments/css/foundation.min.css' %}" /> + diff --git a/tournaments/templates/tournaments/broadcast.html b/tournaments/templates/tournaments/broadcast/broadcast.html similarity index 93% rename from tournaments/templates/tournaments/broadcast.html rename to tournaments/templates/tournaments/broadcast/broadcast.html index f293aa2..87b8b48 100644 --- a/tournaments/templates/tournaments/broadcast.html +++ b/tournaments/templates/tournaments/broadcast/broadcast.html @@ -1,4 +1,4 @@ -{% extends 'tournaments/broadcast_base.html' %} +{% extends 'tournaments/broadcast/broadcast_base.html' %} {% load static %} diff --git a/tournaments/templates/tournaments/broadcast_base.html b/tournaments/templates/tournaments/broadcast/broadcast_base.html similarity index 95% rename from tournaments/templates/tournaments/broadcast_base.html rename to tournaments/templates/tournaments/broadcast/broadcast_base.html index 9b32253..e1766fc 100644 --- a/tournaments/templates/tournaments/broadcast_base.html +++ b/tournaments/templates/tournaments/broadcast/broadcast_base.html @@ -4,7 +4,7 @@ {% load qr_code %} - {% include 'tournaments/base_head.html' %} + {% include 'tournaments/broadcast/base_head.html' %} diff --git a/tournaments/templates/tournaments/broadcast_club.html b/tournaments/templates/tournaments/broadcast/broadcast_club.html similarity index 96% rename from tournaments/templates/tournaments/broadcast_club.html rename to tournaments/templates/tournaments/broadcast/broadcast_club.html index e04b7ea..5a9e14e 100644 --- a/tournaments/templates/tournaments/broadcast_club.html +++ b/tournaments/templates/tournaments/broadcast/broadcast_club.html @@ -1,4 +1,4 @@ -{% extends 'tournaments/broadcast_base.html' %} +{% extends 'tournaments/broadcast/broadcast_base.html' %} {% load static %} diff --git a/tournaments/templates/tournaments/broadcasted_auto.html b/tournaments/templates/tournaments/broadcast/broadcasted_auto.html similarity index 96% rename from tournaments/templates/tournaments/broadcasted_auto.html rename to tournaments/templates/tournaments/broadcast/broadcasted_auto.html index 0fd2641..7fa0245 100644 --- a/tournaments/templates/tournaments/broadcasted_auto.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_auto.html @@ -4,7 +4,7 @@ {% load qr_code %} - {% include 'tournaments/base_head.html' %} + {% include 'tournaments/broadcast/base_head.html' %} @@ -93,7 +93,7 @@
-
+
{% qr_from_text qr_code_url options=qr_code_options %}
@@ -107,7 +107,7 @@ @@ -115,7 +115,7 @@ @@ -123,7 +123,7 @@ diff --git a/tournaments/templates/tournaments/broadcasted_group_stage.html b/tournaments/templates/tournaments/broadcast/broadcasted_group_stage.html similarity index 100% rename from tournaments/templates/tournaments/broadcasted_group_stage.html rename to tournaments/templates/tournaments/broadcast/broadcasted_group_stage.html diff --git a/tournaments/templates/tournaments/broadcasted_group_stages.html b/tournaments/templates/tournaments/broadcast/broadcasted_group_stages.html similarity index 95% rename from tournaments/templates/tournaments/broadcasted_group_stages.html rename to tournaments/templates/tournaments/broadcast/broadcasted_group_stages.html index 5f2a2e9..ff460fb 100644 --- a/tournaments/templates/tournaments/broadcasted_group_stages.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_group_stages.html @@ -6,6 +6,7 @@ + @@ -68,7 +69,7 @@
- {% include 'tournaments/broadcasted_group_stage.html' %} + {% include 'tournaments/broadcast/broadcasted_group_stage.html' %}
diff --git a/tournaments/templates/tournaments/broadcasted_match.html b/tournaments/templates/tournaments/broadcast/broadcasted_match.html similarity index 100% rename from tournaments/templates/tournaments/broadcasted_match.html rename to tournaments/templates/tournaments/broadcast/broadcasted_match.html diff --git a/tournaments/templates/tournaments/broadcasted_matches.html b/tournaments/templates/tournaments/broadcast/broadcasted_matches.html similarity index 95% rename from tournaments/templates/tournaments/broadcasted_matches.html rename to tournaments/templates/tournaments/broadcast/broadcasted_matches.html index 1367d2f..fe29ed6 100644 --- a/tournaments/templates/tournaments/broadcasted_matches.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_matches.html @@ -5,6 +5,7 @@ + @@ -67,7 +68,7 @@
- {% include 'tournaments/broadcasted_match.html' %} + {% include 'tournaments/broadcast/broadcasted_match.html' %}
diff --git a/tournaments/templates/tournaments/broadcasted_ranking.html b/tournaments/templates/tournaments/broadcast/broadcasted_ranking.html similarity index 100% rename from tournaments/templates/tournaments/broadcasted_ranking.html rename to tournaments/templates/tournaments/broadcast/broadcasted_ranking.html diff --git a/tournaments/templates/tournaments/broadcasted_rankings.html b/tournaments/templates/tournaments/broadcast/broadcasted_rankings.html similarity index 93% rename from tournaments/templates/tournaments/broadcasted_rankings.html rename to tournaments/templates/tournaments/broadcast/broadcasted_rankings.html index e806847..237d821 100644 --- a/tournaments/templates/tournaments/broadcasted_rankings.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_rankings.html @@ -1,4 +1,4 @@ -{% extends 'tournaments/broadcast_base.html' %} +{% extends 'tournaments/broadcast/broadcast_base.html' %} {% block head_title %}Classement{% endblock %} {% block first_title %}{{ tournament.display_name }}{% endblock %} @@ -58,7 +58,7 @@
diff --git a/tournaments/templates/tournaments/broadcasted_summon.html b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html similarity index 100% rename from tournaments/templates/tournaments/broadcasted_summon.html rename to tournaments/templates/tournaments/broadcast/broadcasted_summon.html diff --git a/tournaments/templates/tournaments/broadcasted_summons.html b/tournaments/templates/tournaments/broadcast/broadcasted_summons.html similarity index 95% rename from tournaments/templates/tournaments/broadcasted_summons.html rename to tournaments/templates/tournaments/broadcast/broadcasted_summons.html index 6545128..a2a4007 100644 --- a/tournaments/templates/tournaments/broadcasted_summons.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_summons.html @@ -1,4 +1,4 @@ -{% extends 'tournaments/broadcast_base.html' %} +{% extends 'tournaments/broadcast/broadcast_base.html' %} {% block head_title %}Convocations{% endblock %} {% block first_title %}{{ tournament.display_name }}{% endblock %} @@ -55,7 +55,7 @@