h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 20:22:55 +08:00
Code Issues Releases Wiki Activity

Use OsuColour for profile overlay

Browse Source
This commit is contained in:
Dean Herbert 2019-05-20 15:58:40 +09:00
parent 39e03ae705
commit 455301de2c
10 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game/Graphics/OsuColour.cs
View File

@ -77,7 +77,7 @@ namespace osu.Game.Graphics
public readonly Color4 Seafoam = FromHex(@"05ffa2"); public readonly Color4 Seafoam = FromHex(@"05ffa2");
public readonly Color4 GreySeafoamLighter = FromHex(@"9ebab1"); public readonly Color4 GreySeafoamLighter = FromHex(@"9ebab1");
public readonly Color4 GreySeafoamLight = FromHex(@"4d7365"); public readonly Color4 GreySeafoamLight = FromHex(@"4e7466");
public readonly Color4 GreySeafoam = FromHex(@"33413c"); public readonly Color4 GreySeafoam = FromHex(@"33413c");
public readonly Color4 GreySeafoamDark = FromHex(@"2c3532"); public readonly Color4 GreySeafoamDark = FromHex(@"2c3532");
public readonly Color4 GreySeafoamDarker = FromHex(@"1e2422"); public readonly Color4 GreySeafoamDarker = FromHex(@"1e2422");
@ -136,15 +136,5 @@ namespace osu.Game.Graphics
public readonly Color4 ChatBlue = FromHex(@"17292e"); public readonly Color4 ChatBlue = FromHex(@"17292e");
public readonly Color4 ContextMenuGray = FromHex(@"223034"); public readonly Color4 ContextMenuGray = FromHex(@"223034");
public readonly Color4 CommunityUserGreenLight = FromHex(@"deff87");
public readonly Color4 CommunityUserGreen = FromHex(@"05ffa2");
public readonly Color4 CommunityUserGreenDark = FromHex(@"a6cc00");
public readonly Color4 CommunityUserGrayGreenLighter = FromHex(@"9ebab1");
public readonly Color4 CommunityUserGrayGreenLight = FromHex(@"77998e");
public readonly Color4 CommunityUserGrayGreen = FromHex(@"4e7466");
public readonly Color4 CommunityUserGrayGreenDark = FromHex(@"33413c");
public readonly Color4 CommunityUserGrayGreenDarker = FromHex(@"2c3532");
public readonly Color4 CommunityUserGrayGreenDarkest = FromHex(@"1e2422");
} }
} }

4
osu.Game/Overlays/Profile/Header/BottomHeaderContainer.cs
View File

@ -35,14 +35,14 @@ namespace osu.Game.Overlays.Profile.Header
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
iconColour = colours.CommunityUserGrayGreenLighter; iconColour = colours.GreySeafoamLighter;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colours.CommunityUserGrayGreenDarker, Colour = colours.GreySeafoamDark,
}, },
new FillFlowContainer new FillFlowContainer
{ {

2
osu.Game/Overlays/Profile/Header/CentreHeaderContainer.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Overlays.Profile.Header
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colours.CommunityUserGrayGreenDark Colour = colours.GreySeafoam
}, },
new FillFlowContainer new FillFlowContainer
{ {

4
osu.Game/Overlays/Profile/Header/Components/ExpandDetailsButton.cs
View File

@ -27,8 +27,8 @@ namespace osu.Game.Overlays.Profile.Header.Components
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
IdleColour = colours.CommunityUserGrayGreen; IdleColour = colours.GreySeafoamLight;
HoverColour = colours.CommunityUserGrayGreen.Darken(0.2f); HoverColour = colours.GreySeafoamLight.Darken(0.2f);
Child = icon = new SpriteIcon Child = icon = new SpriteIcon
{ {

4
osu.Game/Overlays/Profile/Header/Components/RankGraph.cs
View File

@ -154,7 +154,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
ballBg.Colour = colours.CommunityUserGrayGreenDarkest; ballBg.Colour = colours.GreySeafoamDarker;
movingBall.BorderColour = colours.Yellow; movingBall.BorderColour = colours.Yellow;
movingBar.Colour = colours.Yellow; movingBar.Colour = colours.Yellow;
} }
@ -249,7 +249,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
background.Colour = colours.CommunityUserGrayGreenDarker; background.Colour = colours.GreySeafoamDark;
} }
public void Refresh() public void Refresh()

2
osu.Game/Overlays/Profile/Header/Components/SupporterIcon.cs
View File

@ -80,7 +80,7 @@ namespace osu.Game.Overlays.Profile.Header.Components
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
background.Colour = colours.Pink; background.Colour = colours.Pink;
iconContainer.Colour = colours.CommunityUserGrayGreenDark; iconContainer.Colour = colours.GreySeafoam;
} }
} }
} }

2
osu.Game/Overlays/Profile/Header/DetailHeaderContainer.cs
View File

@ -65,7 +65,7 @@ namespace osu.Game.Overlays.Profile.Header
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colours.CommunityUserGrayGreenDarkest, Colour = colours.GreySeafoamDarker,
}, },
fillFlow = new FillFlowContainer fillFlow = new FillFlowContainer
{ {

2
osu.Game/Overlays/Profile/Header/MedalHeaderContainer.cs
View File

@ -34,7 +34,7 @@ namespace osu.Game.Overlays.Profile.Header
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colours.CommunityUserGrayGreenDarkest, Colour = colours.GreySeafoamDarker,
}, },
new Container //artificial shadow new Container //artificial shadow
{ {

6
osu.Game/Overlays/Profile/Header/TopHeaderContainer.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Profile.Header
new Box new Box
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = colours.CommunityUserGrayGreenDarker, Colour = colours.GreySeafoamDark,
}, },
new FillFlowContainer new FillFlowContainer
{ {
@ -107,7 +107,7 @@ namespace osu.Game.Overlays.Profile.Header
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = 1.5f, Height = 1.5f,
Margin = new MarginPadding { Top = 10 }, Margin = new MarginPadding { Top = 10 },
Colour = colours.CommunityUserGrayGreenLighter, Colour = colours.GreySeafoamLighter,
}, },
new Container new Container
{ {
@ -125,7 +125,7 @@ namespace osu.Game.Overlays.Profile.Header
Margin = new MarginPadding { Left = 40 }, Margin = new MarginPadding { Left = 40 },
Origin = Anchor.CentreLeft, Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Colour = colours.CommunityUserGrayGreenLighter, Colour = colours.GreySeafoamLighter,
} }
} }
}, },

4
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Profile
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
infoTabControl.AccentColour = colours.CommunityUserGreen; infoTabControl.AccentColour = colours.Seafoam;
} }
public Bindable<User> User = new Bindable<User>(); public Bindable<User> User = new Bindable<User>();
@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Profile
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
AccentColour = colours.CommunityUserGreen; AccentColour = colours.Seafoam;
} }
} }
} }