mirror of
https://github.com/ppy/osu.git
synced 2024-12-15 09:42:54 +08:00
Merge branch 'master' into fix-decoding-loop
This commit is contained in:
commit
f19b5ba570
@ -57,7 +57,6 @@ namespace osu.Game.Overlays
|
||||
{
|
||||
Anchor = Anchor.Centre,
|
||||
Origin = Anchor.Centre,
|
||||
Y = -15,
|
||||
Size = new Vector2(15),
|
||||
Shadow = true,
|
||||
Icon = FontAwesome.Solid.ChevronLeft
|
||||
|
@ -52,7 +52,6 @@ namespace osu.Game.Rulesets.UI
|
||||
Anchor = Anchor.Centre,
|
||||
Size = new Vector2(size),
|
||||
Icon = OsuIcon.ModBg,
|
||||
Y = -6.5f,
|
||||
Shadow = true,
|
||||
},
|
||||
modIcon = new SpriteIcon
|
||||
|
@ -98,6 +98,7 @@ namespace osu.Game.Screens.Select.Carousel
|
||||
new FillFlowContainer<FilterableDifficultyIcon>
|
||||
{
|
||||
AutoSizeAxes = Axes.Both,
|
||||
Spacing = new Vector2(3),
|
||||
Children = ((CarouselBeatmapSet)Item).Beatmaps.Select(b => new FilterableDifficultyIcon(b)).ToList()
|
||||
},
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user