mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-21 12:01:38 +00:00
Fix wonky merge
This commit is contained in:
parent
31244bbcb0
commit
4e9cd40062
1 changed files with 0 additions and 17 deletions
|
|
@ -237,23 +237,6 @@ function Notification:render()
|
||||||
})
|
})
|
||||||
else nil,
|
else nil,
|
||||||
}),
|
}),
|
||||||
Actions = if self.props.actions
|
|
||||||
then e("Frame", {
|
|
||||||
Size = UDim2.new(1, -40, 0, 35),
|
|
||||||
Position = UDim2.new(1, 0, 1, 0),
|
|
||||||
AnchorPoint = Vector2.new(1, 1),
|
|
||||||
BackgroundTransparency = 1,
|
|
||||||
}, {
|
|
||||||
Layout = e("UIListLayout", {
|
|
||||||
FillDirection = Enum.FillDirection.Horizontal,
|
|
||||||
HorizontalAlignment = Enum.HorizontalAlignment.Right,
|
|
||||||
VerticalAlignment = Enum.VerticalAlignment.Center,
|
|
||||||
SortOrder = Enum.SortOrder.LayoutOrder,
|
|
||||||
Padding = UDim.new(0, 5),
|
|
||||||
}),
|
|
||||||
Buttons = Roact.createFragment(actionButtons),
|
|
||||||
})
|
|
||||||
else nil,
|
|
||||||
|
|
||||||
Padding = e("UIPadding", {
|
Padding = e("UIPadding", {
|
||||||
PaddingLeft = UDim.new(0, 17),
|
PaddingLeft = UDim.new(0, 17),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue