hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-21 20:14:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix theme usage

Browse source
This commit is contained in:
boatbomber 2024-12-22 13:48:21 -08:00
parent 03fa1b3ab2
commit a330c1243b
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugin/src/App/ConflictAPIPopup.lua
View file

@ -16,7 +16,7 @@ local ConflictAPIPopup = Roact.Component:extend("ConflictAPIPopup")
function ConflictAPIPopup:render() function ConflictAPIPopup:render()
return Theme.with(function(theme) return Theme.with(function(theme)
theme = theme.Settings local settingTheme = theme.Settings
return e("Frame", { return e("Frame", {
BackgroundTransparency = 1, BackgroundTransparency = 1,
@ -47,7 +47,7 @@ function ConflictAPIPopup:render()
Text = "There is already a Rojo API exposed by a Rojo plugin. Do you want to overwrite it with this one?", Text = "There is already a Rojo API exposed by a Rojo plugin. Do you want to overwrite it with this one?",
FontFace = theme.Font.Main, FontFace = theme.Font.Main,
TextSize = theme.TextSize.Medium, TextSize = theme.TextSize.Medium,
TextColor3 = theme.Setting.NameColor, TextColor3 = settingTheme.Setting.NameColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextWrapped = true, TextWrapped = true,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
@ -65,7 +65,7 @@ function ConflictAPIPopup:render()
), ),
FontFace = theme.Font.Thin, FontFace = theme.Font.Thin,
TextSize = theme.TextSize.Body, TextSize = theme.TextSize.Body,
TextColor3 = theme.Setting.DescriptionColor, TextColor3 = settingTheme.Setting.DescriptionColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
LayoutOrder = 2, LayoutOrder = 2,
@ -82,7 +82,7 @@ function ConflictAPIPopup:render()
), ),
FontFace = theme.Font.Thin, FontFace = theme.Font.Thin,
TextSize = theme.TextSize.Body, TextSize = theme.TextSize.Body,
TextColor3 = theme.Setting.DescriptionColor, TextColor3 = settingTheme.Setting.DescriptionColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
LayoutOrder = 3, LayoutOrder = 3,

20
plugin/src/App/PermissionPopup.lua
View file

@ -23,7 +23,7 @@ end
function PermissionPopup:render() function PermissionPopup:render()
return Theme.with(function(theme) return Theme.with(function(theme)
theme = theme.Settings local settingsTheme = theme.Settings
local thumbnail = Assets.Images.ThirdPartyPlugin local thumbnail = Assets.Images.ThirdPartyPlugin
local thumbnailId = string.match(self.props.source, "cloud_(%d+)") local thumbnailId = string.match(self.props.source, "cloud_(%d+)")
@ -46,7 +46,7 @@ function PermissionPopup:render()
AutomaticSize = Enum.AutomaticSize.Y, AutomaticSize = Enum.AutomaticSize.Y,
}, { }, {
Divider = e("Frame", { Divider = e("Frame", {
BackgroundColor3 = theme.DividerColor, BackgroundColor3 = settingsTheme.DividerColor,
BackgroundTransparency = self.props.transparency, BackgroundTransparency = self.props.transparency,
Size = UDim2.new(1, 0, 0, 1), Size = UDim2.new(1, 0, 0, 1),
Position = UDim2.new(0, 0, 0, -2), Position = UDim2.new(0, 0, 0, -2),
@ -70,7 +70,7 @@ function PermissionPopup:render()
Text = api, Text = api,
FontFace = theme.Font.Thin, FontFace = theme.Font.Thin,
TextSize = theme.TextSize.Medium, TextSize = theme.TextSize.Medium,
TextColor3 = theme.Setting.NameColor, TextColor3 = settingsTheme.Setting.NameColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
}), }),
@ -83,7 +83,7 @@ function PermissionPopup:render()
Text = apiDesc.Description, Text = apiDesc.Description,
FontFace = theme.Font.Thin, FontFace = theme.Font.Thin,
TextSize = theme.TextSize.Body, TextSize = theme.TextSize.Body,
TextColor3 = theme.Setting.DescriptionColor, TextColor3 = settingsTheme.Setting.DescriptionColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
}), }),
@ -101,7 +101,7 @@ function PermissionPopup:render()
AutomaticSize = Enum.AutomaticSize.Y, AutomaticSize = Enum.AutomaticSize.Y,
FontFace = theme.Font.Main, FontFace = theme.Font.Main,
TextSize = theme.TextSize.Medium, TextSize = theme.TextSize.Medium,
TextColor3 = theme.Setting.NameColor, TextColor3 = settingsTheme.Setting.NameColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
}, e("UIPadding", { PaddingBottom = UDim.new(0, 8) })) }, e("UIPadding", { PaddingBottom = UDim.new(0, 8) }))
@ -116,7 +116,7 @@ function PermissionPopup:render()
AutomaticSize = Enum.AutomaticSize.Y, AutomaticSize = Enum.AutomaticSize.Y,
FontFace = theme.Font.Main, FontFace = theme.Font.Main,
TextSize = theme.TextSize.Medium, TextSize = theme.TextSize.Medium,
TextColor3 = theme.Setting.NameColor, TextColor3 = settingsTheme.Setting.NameColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
}, e("UIPadding", { PaddingBottom = UDim.new(0, 8) })) }, e("UIPadding", { PaddingBottom = UDim.new(0, 8) }))
@ -131,7 +131,7 @@ function PermissionPopup:render()
AutomaticSize = Enum.AutomaticSize.Y, AutomaticSize = Enum.AutomaticSize.Y,
FontFace = theme.Font.Main, FontFace = theme.Font.Main,
TextSize = theme.TextSize.Medium, TextSize = theme.TextSize.Medium,
TextColor3 = theme.Setting.NameColor, TextColor3 = settingsTheme.Setting.NameColor,
TextXAlignment = Enum.TextXAlignment.Left, TextXAlignment = Enum.TextXAlignment.Left,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
}, e("UIPadding", { PaddingBottom = UDim.new(0, 8) })) }, e("UIPadding", { PaddingBottom = UDim.new(0, 8) }))
@ -179,7 +179,7 @@ function PermissionPopup:render()
BackgroundTransparency = 1, BackgroundTransparency = 1,
Size = UDim2.new(0, 24, 0, 24), Size = UDim2.new(0, 24, 0, 24),
Image = Assets.Images.Icons.Transact, Image = Assets.Images.Icons.Transact,
ImageColor3 = theme.Setting.DescriptionColor, ImageColor3 = settingsTheme.Setting.DescriptionColor,
LayoutOrder = 2, LayoutOrder = 2,
}), }),
@ -198,7 +198,7 @@ function PermissionPopup:render()
Text = string.format("%s is asking to use the Rojo API", self.props.name or "[Unknown]"), Text = string.format("%s is asking to use the Rojo API", self.props.name or "[Unknown]"),
FontFace = theme.Font.Bold, FontFace = theme.Font.Bold,
TextSize = theme.TextSize.Medium, TextSize = theme.TextSize.Medium,
TextColor3 = theme.Setting.NameColor, TextColor3 = settingsTheme.Setting.NameColor,
TextXAlignment = Enum.TextXAlignment.Center, TextXAlignment = Enum.TextXAlignment.Center,
TextWrapped = true, TextWrapped = true,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
@ -211,7 +211,7 @@ function PermissionPopup:render()
Divider = e("Frame", { Divider = e("Frame", {
LayoutOrder = 3, LayoutOrder = 3,
BackgroundColor3 = theme.DividerColor, BackgroundColor3 = settingsTheme.DividerColor,
BackgroundTransparency = self.props.transparency, BackgroundTransparency = self.props.transparency,
Size = UDim2.new(1, 0, 0, 1), Size = UDim2.new(1, 0, 0, 1),
Position = UDim2.new(0, 0, 0, -2), Position = UDim2.new(0, 0, 0, -2),

10
plugin/src/App/StatusPages/Permissions/init.lua
View file

@ -16,7 +16,7 @@ local e = Roact.createElement
local function Navbar(props) local function Navbar(props)
return Theme.with(function(theme) return Theme.with(function(theme)
theme = theme.Settings.Navbar local navbarTheme = theme.Settings.Navbar
return e("Frame", { return e("Frame", {
Size = UDim2.new(1, 0, 0, 46), Size = UDim2.new(1, 0, 0, 46),
@ -31,7 +31,7 @@ local function Navbar(props)
Back = e(IconButton, { Back = e(IconButton, {
icon = Assets.Images.Icons.Back, icon = Assets.Images.Icons.Back,
iconSize = 24, iconSize = 24,
color = theme.BackButtonColor, color = navbarTheme.BackButtonColor,
transparency = props.transparency, transparency = props.transparency,
position = UDim2.new(0, 0, 0.5, 0), position = UDim2.new(0, 0, 0.5, 0),
@ -48,7 +48,7 @@ local function Navbar(props)
Text = "Permissions", Text = "Permissions",
FontFace = theme.Font.Thin, FontFace = theme.Font.Thin,
TextSize = theme.TextSize.Large, TextSize = theme.TextSize.Large,
TextColor3 = theme.TextColor, TextColor3 = navbarTheme.TextColor,
TextTransparency = props.transparency, TextTransparency = props.transparency,
Size = UDim2.new(1, 0, 1, 0), Size = UDim2.new(1, 0, 1, 0),
@ -81,7 +81,7 @@ end
function PermissionsPage:render() function PermissionsPage:render()
return Theme.with(function(theme) return Theme.with(function(theme)
theme = theme.Settings local settingsTheme = theme.Settings
local sources = {} local sources = {}
for source, permissions in self.state.permissions do for source, permissions in self.state.permissions do
@ -117,7 +117,7 @@ function PermissionsPage:render()
Text = "No third-party plugins have been granted permissions.", Text = "No third-party plugins have been granted permissions.",
FontFace = theme.Font.Thin, FontFace = theme.Font.Thin,
TextSize = theme.TextSize.Large, TextSize = theme.TextSize.Large,
TextColor3 = theme.Setting.DescriptionColor, TextColor3 = settingsTheme.Setting.DescriptionColor,
TextTransparency = self.props.transparency, TextTransparency = self.props.transparency,
TextWrapped = true, TextWrapped = true,