From ba97b887b44ab21b87bcbb565dfeba7512510520 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jun 2019 19:49:23 +0900
Subject: [PATCH 1/2] Allow cusotmisation of the colour portion of the
 tournament logo header

---
 .../Screens/Gameplay/Components/MatchHeader.cs            | 8 --------
 osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs    | 6 +-----
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
index cfa44537d6..9e1888b44b 100644
--- a/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
+++ b/osu.Game.Tournament/Screens/Gameplay/Components/MatchHeader.cs
@@ -5,7 +5,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
@@ -191,8 +190,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
 
             public RoundDisplay()
             {
-                CornerRadius = 10;
-                Masking = true;
                 Width = 200;
                 Height = 20;
             }
@@ -208,11 +205,6 @@ namespace osu.Game.Tournament.Screens.Gameplay.Components
             {
                 InternalChildren = new Drawable[]
                 {
-                    new Box
-                    {
-                        Colour = new Color4(47, 71, 67, 255),
-                        RelativeSizeAxes = Axes.Both,
-                    },
                     new OsuSpriteText
                     {
                         Anchor = Anchor.Centre,
diff --git a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
index 0db3348e5d..6ca542626e 100644
--- a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
+++ b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osuTK;
 
 namespace osu.Game.Tournament.Screens.Showcase
 {
@@ -15,7 +14,7 @@ namespace osu.Game.Tournament.Screens.Showcase
         public TournamentLogo()
         {
             RelativeSizeAxes = Axes.X;
-            Height = 95;
+            AutoSizeAxes = Axes.Y;
             Margin = new MarginPadding { Vertical = 5 };
         }
 
@@ -27,9 +26,6 @@ namespace osu.Game.Tournament.Screens.Showcase
                 Texture = textures.Get("game-screen-logo"),
                 Anchor = Anchor.TopCentre,
                 Origin = Anchor.TopCentre,
-                FillMode = FillMode.Fit,
-                RelativeSizeAxes = Axes.Both,
-                Size = Vector2.One
             };
         }
     }

From d595860b1471e32f1b41f799aab5f90459502cf9 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jun 2019 20:09:42 +0900
Subject: [PATCH 2/2] Remove background from team intro screen

---
 .../Screens/Showcase/TournamentLogo.cs              | 13 +++++++++++--
 .../Screens/TeamIntro/TeamIntroScreen.cs            |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
index 6ca542626e..1fee2b29e8 100644
--- a/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
+++ b/osu.Game.Tournament/Screens/Showcase/TournamentLogo.cs
@@ -11,11 +11,20 @@ namespace osu.Game.Tournament.Screens.Showcase
 {
     public class TournamentLogo : CompositeDrawable
     {
-        public TournamentLogo()
+        public TournamentLogo(bool includeRoundBackground = true)
         {
             RelativeSizeAxes = Axes.X;
-            AutoSizeAxes = Axes.Y;
             Margin = new MarginPadding { Vertical = 5 };
+
+            if (includeRoundBackground)
+            {
+                AutoSizeAxes = Axes.Y;
+            }
+            else
+            {
+                Masking = true;
+                Height = 100;
+            }
         }
 
         [BackgroundDependencyLoader]
diff --git a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
index 2cb4ffe4e9..c901a5c7ef 100644
--- a/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
+++ b/osu.Game.Tournament/Screens/TeamIntro/TeamIntroScreen.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Tournament.Screens.TeamIntro
                     RelativeSizeAxes = Axes.Both,
                     Loop = true,
                 },
-                new TournamentLogo(),
+                new TournamentLogo(false),
                 mainContainer = new Container
                 {
                     RelativeSizeAxes = Axes.Both,