mirror of
https://github.com/rojo-rbx/rojo.git
synced 2026-10-21 20:21:38 +00:00
Better light theme support
This commit is contained in:
parent
3b1aca2958
commit
e24657ca4d
1 changed files with 19 additions and 24 deletions
|
|
@ -37,8 +37,6 @@ end
|
||||||
|
|
||||||
function Listing:render()
|
function Listing:render()
|
||||||
return Theme.with(function(theme)
|
return Theme.with(function(theme)
|
||||||
theme = theme.Settings
|
|
||||||
|
|
||||||
return e("Frame", {
|
return e("Frame", {
|
||||||
Size = self.contentSize:map(function(value)
|
Size = self.contentSize:map(function(value)
|
||||||
return UDim2.new(1, 0, 0, 20 + value.Y + 20)
|
return UDim2.new(1, 0, 0, 20 + value.Y + 20)
|
||||||
|
|
@ -62,27 +60,24 @@ function Listing:render()
|
||||||
self.props.onClick()
|
self.props.onClick()
|
||||||
end,
|
end,
|
||||||
}, {
|
}, {
|
||||||
Button = Theme.with(function(theme)
|
Button = e(SlicedImage, {
|
||||||
theme = theme.Checkbox
|
slice = Assets.Slices.RoundedBorder,
|
||||||
return e(SlicedImage, {
|
color = theme.Checkbox.Inactive.BorderColor,
|
||||||
slice = Assets.Slices.RoundedBorder,
|
transparency = self.props.transparency,
|
||||||
color = theme.Inactive.BorderColor,
|
size = UDim2.new(1, 0, 1, 0),
|
||||||
transparency = self.props.transparency,
|
}, {
|
||||||
size = UDim2.new(1, 0, 1, 0),
|
Icon = e("ImageLabel", {
|
||||||
}, {
|
Image = Assets.Images.Icons.Settings,
|
||||||
Icon = e("ImageLabel", {
|
ImageColor3 = theme.Notification.InfoColor,
|
||||||
Image = Assets.Images.Icons.Settings,
|
ImageTransparency = self.props.transparency,
|
||||||
ImageColor3 = theme.Active.IconColor,
|
|
||||||
ImageTransparency = self.props.transparency,
|
|
||||||
|
|
||||||
Size = UDim2.new(0, 16, 0, 16),
|
Size = UDim2.new(0, 16, 0, 16),
|
||||||
Position = UDim2.new(0.5, 0, 0.5, 0),
|
Position = UDim2.new(0.5, 0, 0.5, 0),
|
||||||
AnchorPoint = Vector2.new(0.5, 0.5),
|
AnchorPoint = Vector2.new(0.5, 0.5),
|
||||||
|
|
||||||
BackgroundTransparency = 1,
|
BackgroundTransparency = 1,
|
||||||
}),
|
}),
|
||||||
})
|
}),
|
||||||
end),
|
|
||||||
}),
|
}),
|
||||||
|
|
||||||
Text = e("Frame", {
|
Text = e("Frame", {
|
||||||
|
|
@ -93,7 +88,7 @@ function Listing:render()
|
||||||
Text = self.props.name,
|
Text = self.props.name,
|
||||||
Font = Enum.Font.GothamBold,
|
Font = Enum.Font.GothamBold,
|
||||||
TextSize = 17,
|
TextSize = 17,
|
||||||
TextColor3 = theme.Setting.NameColor,
|
TextColor3 = theme.Settings.Setting.NameColor,
|
||||||
TextXAlignment = Enum.TextXAlignment.Left,
|
TextXAlignment = Enum.TextXAlignment.Left,
|
||||||
TextTransparency = self.props.transparency,
|
TextTransparency = self.props.transparency,
|
||||||
|
|
||||||
|
|
@ -108,7 +103,7 @@ function Listing:render()
|
||||||
Font = Enum.Font.Gotham,
|
Font = Enum.Font.Gotham,
|
||||||
LineHeight = 1.2,
|
LineHeight = 1.2,
|
||||||
TextSize = 14,
|
TextSize = 14,
|
||||||
TextColor3 = theme.Setting.DescriptionColor,
|
TextColor3 = theme.Settings.Setting.DescriptionColor,
|
||||||
TextXAlignment = Enum.TextXAlignment.Left,
|
TextXAlignment = Enum.TextXAlignment.Left,
|
||||||
TextTransparency = self.props.transparency,
|
TextTransparency = self.props.transparency,
|
||||||
TextWrapped = true,
|
TextWrapped = true,
|
||||||
|
|
@ -143,7 +138,7 @@ function Listing:render()
|
||||||
}),
|
}),
|
||||||
|
|
||||||
Divider = e("Frame", {
|
Divider = e("Frame", {
|
||||||
BackgroundColor3 = theme.DividerColor,
|
BackgroundColor3 = theme.Settings.DividerColor,
|
||||||
BackgroundTransparency = self.props.transparency,
|
BackgroundTransparency = self.props.transparency,
|
||||||
Size = UDim2.new(1, 0, 0, 1),
|
Size = UDim2.new(1, 0, 0, 1),
|
||||||
BorderSizePixel = 0,
|
BorderSizePixel = 0,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue