1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-30 05:59:53 +08:00

Merge branch 'refs/heads/update-framework' into general-fixes

This commit is contained in:
Thomas Müller
2017-02-17 21:26:39 +01:00
Unverified
2 changed files with 3 additions and 1 deletions
@@ -38,6 +38,7 @@ namespace osu.Game.Online.Chat.Drawables
},
new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{
flow = new FlowContainer
+2 -1
View File
@@ -38,8 +38,9 @@ namespace osu.Game.Overlays
Colour = Color4.Black,
Alpha = 0.6f,
},
scrollContainer = new ScrollContainer()
scrollContainer = new ScrollContainer
{
RelativeSizeAxes = Axes.Both,
Margin = new MarginPadding { Top = Toolbar.Toolbar.HEIGHT },
Children = new[]
{