Merge remote-tracking branch 'origin/master' into audio-refactor-update

This commit is contained in:
smoogipoo
2019-06-04 10:50:33 +09:00
25 changed files with 1396 additions and 22 deletions

View File

@ -40,8 +40,10 @@ namespace osu.Game.Graphics
// See https://github.com/ppy/osu-web/blob/master/resources/assets/less/colors.less
public readonly Color4 PurpleLighter = FromHex(@"eeeeff");
public readonly Color4 PurpleLight = FromHex(@"aa88ff");
public readonly Color4 PurpleLightAlternative = FromHex(@"cba4da");
public readonly Color4 Purple = FromHex(@"8866ee");
public readonly Color4 PurpleDark = FromHex(@"6644cc");
public readonly Color4 PurpleDarkAlternative = FromHex(@"312436");
public readonly Color4 PurpleDarker = FromHex(@"441188");
public readonly Color4 PinkLighter = FromHex(@"ffddee");

View File

@ -76,11 +76,11 @@ namespace osu.Game.Graphics.UserInterface
{
titleText = new OsuSpriteText
{
Font = OsuFont.GetFont(size: 25),
Font = OsuFont.GetFont(size: 30, weight: FontWeight.Light),
},
pageText = new OsuSpriteText
{
Font = OsuFont.GetFont(size: 25),
Font = OsuFont.GetFont(size: 30, weight: FontWeight.Light),
}
}
}