ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Fix Table diff colors (#1084)

Browse Source
This commit is contained in:
Sebastian Stachowicz
2025-08-01 02:36:03 +00:00
committed by GitHub
parent 9598553e5d
commit 3002d250a1
6 changed files with 33 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/App/Components/PatchVisualizer/DomLabel.lua
View File

@@ -95,7 +95,7 @@ function DomLabel:render()
return Theme.with(function(theme)
local color = if props.isWarning
then theme.Diff.Warning
elseif props.patchType then theme.Diff[props.patchType]
elseif props.patchType then theme.Diff.Background[props.patchType]
else theme.TextColor
local indent = (depth - 1) * 12 + 15

4
plugin/src/App/Components/StringDiffVisualizer/init.lua
View File

@@ -178,7 +178,7 @@ function StringDiffVisualizer:render()
size = UDim2.new(1, 0, 1, 0),
position = UDim2.new(0, 0, 0, 0),
text = oldString,
lineBackground = theme.Diff.Remove,
lineBackground = theme.Diff.Background.Remove,
markedLines = self.state.remove,
}),
}),
@@ -193,7 +193,7 @@ function StringDiffVisualizer:render()
size = UDim2.new(1, 0, 1, 0),
position = UDim2.new(0, 0, 0, 0),
text = newString,
lineBackground = theme.Diff.Add,
lineBackground = theme.Diff.Background.Add,
markedLines = self.state.add,
}),
}),

2
plugin/src/App/Components/TableDiffVisualizer/Array.lua
View File

@@ -93,7 +93,7 @@ function Array:render()
e("Frame", {
Size = UDim2.new(1, 0, 0, 25),
BackgroundTransparency = if patchType == "Remain" then 1 else self.props.transparency,
BackgroundColor3 = if patchType == "Remain" then theme.Diff.Row else theme.Diff[patchType],
BackgroundColor3 = theme.Diff.Background[patchType],
BorderSizePixel = 0,
LayoutOrder = i,
}, {

10
plugin/src/App/Components/TableDiffVisualizer/Dictionary.lua
View File

@@ -91,9 +91,7 @@ function Dictionary:render()
LayoutOrder = order,
BorderSizePixel = 0,
BackgroundTransparency = if line.patchType == "Remain" then 1 else self.props.transparency,
BackgroundColor3 = if line.patchType == "Remain"
then theme.Diff.Row
else theme.Diff[line.patchType],
BackgroundColor3 = theme.Diff.Background[line.patchType],
}, {
DiffIcon = if line.patchType ~= "Remain"
then e("ImageLabel", {
@@ -114,7 +112,7 @@ function Dictionary:render()
TextXAlignment = Enum.TextXAlignment.Left,
FontFace = theme.Font.Main,
TextSize = theme.TextSize.Body,
TextColor3 = theme.Settings.Setting.DescriptionColor,
TextColor3 = theme.Diff.Text[line.patchType],
TextTruncate = Enum.TextTruncate.AtEnd,
}),
OldValue = e("Frame", {
@@ -125,7 +123,7 @@ function Dictionary:render()
e(DisplayValue, {
value = oldValue,
transparency = self.props.transparency,
textColor = theme.Settings.Setting.DescriptionColor,
textColor = theme.Diff.Text[line.patchType],
}),
}),
NewValue = e("Frame", {
@@ -136,7 +134,7 @@ function Dictionary:render()
e(DisplayValue, {
value = newValue,
transparency = self.props.transparency,
textColor = theme.Settings.Setting.DescriptionColor,
textColor = theme.Diff.Text[line.patchType],
}),
}),
})