diff --git a/website/src/components/broadcast/break/BreakMatch.vue b/website/src/components/broadcast/break/BreakMatch.vue index e307d06e..12e5239e 100644 --- a/website/src/components/broadcast/break/BreakMatch.vue +++ b/website/src/components/broadcast/break/BreakMatch.vue @@ -11,7 +11,14 @@ --> + +
+ +
+ {{ match.custom_name }} +
+
{{ team.text }} @@ -47,6 +54,7 @@ export default { props: ["match", "expanded", "timezone", "live", "themeColor"], computed: { teams() { + if (this.match?.special_event) return []; const dummy = { text: "TBD", dummy: true, id: null }; if (!this.match) return [{ ...dummy, _empty: true }, { ...dummy, _empty: true }]; @@ -108,6 +116,7 @@ export default { return "time"; // return this.start; } else { + if (this.match?.special_event) return ""; return "vs"; } // return "vs"; @@ -304,4 +313,9 @@ export default { font-size: calc(1.1em); transform: translate(0, -0.0925em); } + .match-special-event-name { + flex-grow: 1; + line-height: 1; + text-align: center; + } diff --git a/website/src/components/broadcast/desk/DeskMatch.vue b/website/src/components/broadcast/desk/DeskMatch.vue index d5702d17..27ad4776 100644 --- a/website/src/components/broadcast/desk/DeskMatch.vue +++ b/website/src/components/broadcast/desk/DeskMatch.vue @@ -1,7 +1,7 @@ @@ -26,11 +31,11 @@ export default { props: ["_match", "themeColor"], computed: { match() { - if (!this._match?.teams) return null; - if (this._match.teams.length !== 2) return null; - - if (this._match.teams.some(t => !t.theme || t.theme.__loading)) return null; - + if (!this._match?.special_event) { + if (!this._match?.teams) return null; + if (this._match.teams.length !== 2) return null; + if (this._match.teams.some(t => !t.theme || t.theme.__loading)) return null; + } return this._match; }, show() { @@ -52,6 +57,12 @@ export default { return { borderColor: this.themeColor.backgroundColor }; + }, + textBackground() { + console.log(this.themeColor); + return { + ...this.themeColor + }; } } }; @@ -91,4 +102,10 @@ export default { white-space: nowrap; min-width: 180px; } + + .desk-match-text { + font-size: 4em; + border-bottom: 6px solid transparent; + height: 110px; + } diff --git a/website/src/components/website/match/MatchHero.vue b/website/src/components/website/match/MatchHero.vue index e8b8dde7..25a317a8 100644 --- a/website/src/components/website/match/MatchHero.vue +++ b/website/src/components/website/match/MatchHero.vue @@ -1,10 +1,13 @@ @@ -21,7 +24,8 @@ export default { if (!this.match.event || !this.match.event.theme) return {}; return { backgroundColor: this.match.event.theme.color_logo_background || this.match.event.theme.color_theme, - color: this.match.event.theme.color_text_on_logo_background || this.match.event.theme.color_text_on_theme + color: this.match.event.theme.color_text_on_logo_background || this.match.event.theme.color_text_on_theme, + borderColor: this.match.event.theme.color_logo_accent || this.match.event.theme.color_accent }; }, eventLogo() { @@ -58,4 +62,23 @@ export default { position: absolute; z-index: 1; } + + .match-hero.special-event .match-hero-text { + width: 100%; + height: 100%; + font-size: 4em; + font-weight: bold; + border-bottom: 8px solid transparent; + } + + .match-hero.special-event { + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; + } + + /*.match-hero.special-event .match-hero-event {*/ + /* width: 100%;*/ + /*}*/ diff --git a/website/src/components/website/schedule/ScheduleMatch.vue b/website/src/components/website/schedule/ScheduleMatch.vue index 514c8288..425282d8 100644 --- a/website/src/components/website/schedule/ScheduleMatch.vue +++ b/website/src/components/website/schedule/ScheduleMatch.vue @@ -1,9 +1,14 @@ @@ -55,6 +60,7 @@ export default { return [this.match.score_1, this.match.score_2]; }, teams() { + if (this.match?.special_event) return []; const dummy = { text: "TBD", dummy: true, id: null }; if (!this.match) return [{ ...dummy, _empty: true }, { ...dummy, _empty: true }]; @@ -133,15 +139,24 @@ export default { gap: 0px 0px; min-height: 3em; } + .match.special-event { + grid-template-columns: 0.75fr 4.25fr 0.75fr; + } @media (max-width: 957px) { .match { grid-template-columns: 0.75fr 1fr 0.2fr 1fr 0.75fr; } + .match.special-event { + grid-template-columns: 0.75fr 2.2fr 0.75fr; + } } @media (max-width: 767px) { .match { grid-template-columns: 0.5fr 1fr 0.2fr 1fr 0.75fr; } + .match.special-event { + grid-template-columns: 0.5fr 2.2fr 0.5fr; + } } @media (max-width: 575px) { .match-left.match-details, .match-time { @@ -150,6 +165,13 @@ export default { .match { grid-template-columns: 1fr 0.2fr 1fr; } + .match.special-event { + grid-template-columns: 1fr; + } + } + + .match-special-event-name { + font-size: 1.2em; } .match-vs { diff --git a/website/src/utils/theme-styles.js b/website/src/utils/theme-styles.js index d89d0952..cff8f92c 100644 --- a/website/src/utils/theme-styles.js +++ b/website/src/utils/theme-styles.js @@ -15,7 +15,8 @@ export function themeBackground(theme) { if (!theme) return {}; return { backgroundColor: theme.color_theme || theme.color_logo_background, - color: theme.color_text_on_theme || theme.color_alt || theme.color_text_on_logo_background + color: theme.color_text_on_theme || theme.color_alt || theme.color_text_on_logo_background, + borderColor: theme.color_accent }; } export function themeBackground1(item) { diff --git a/website/src/views/DetailedMatch.vue b/website/src/views/DetailedMatch.vue index bbc33ffd..020de54d 100644 --- a/website/src/views/DetailedMatch.vue +++ b/website/src/views/DetailedMatch.vue @@ -5,6 +5,12 @@
+ +
+

Special event

+ This is a special event and doesn't have team information. +
+
diff --git a/website/src/views/Match.vue b/website/src/views/Match.vue index 4734c1cf..d9b82685 100644 --- a/website/src/views/Match.vue +++ b/website/src/views/Match.vue @@ -1,7 +1,7 @@