Merge remote-tracking branch 'upstream/master' into update-framework

This commit is contained in:
Dean Herbert
2018-09-20 18:39:48 +09:00
5 changed files with 31 additions and 11 deletions

View File

@ -82,11 +82,13 @@ namespace osu.Game.Screens.Select.Carousel
Margin = new MarginPadding { Top = 5 },
Children = new Drawable[]
{
new BeatmapSetOnlineStatusPill(11, new MarginPadding { Horizontal = 8, Vertical = 2 })
new BeatmapSetOnlineStatusPill
{
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
Margin = new MarginPadding{ Right = 5 },
Margin = new MarginPadding { Right = 5 },
TextSize = 11,
TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
Status = beatmapSet.Status
},
new FillFlowContainer<FilterableDifficultyIcon>