RomanNum3ral
/
OpenCut
mirror of https://github.com/OpenCut-app/OpenCut.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' of https://github.com/mazeincoding/AppCut into staging

This commit is contained in:
Maze Winther 2025-07-26 11:29:30 +02:00
parent 70fe5cacd1 87a8ac90e5
commit 00bcce8eca
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/web/src/components/editor/properties-panel/index.tsx
View File

@ -41,7 +41,7 @@ export function PropertiesPanel() {
label="Resolution:"
value={`${canvasSize.width} × ${canvasSize.height}`}
/>
<div className="flex justify-between items-center">
<div className="flex flex-col gap-1">
<Label className="text-xs text-muted-foreground">Frame rate:</Label>
<Select
value={(activeProject?.fps || 30).toString()}
@ -101,9 +101,9 @@ export function PropertiesPanel() {
function PropertyItem({ label, value }: { label: string; value: string }) {
return (
<div className="flex justify-between">
<div className="flex flex-col gap-1">
<Label className="text-xs text-muted-foreground">{label}</Label>
<span className="text-xs text-right truncate w-40" title={value}>
<span className="text-xs break-words" title={value}>
{value}
</span>
</div>

14
apps/web/src/components/editor/properties-panel/text-properties.tsx
View File

@ -71,6 +71,20 @@ export function TextProperties({
</div>
</PropertyItemValue>
</PropertyItem>
<PropertyItem direction="row">
<PropertyItemLabel>Color</PropertyItemLabel>
<PropertyItemValue>
<Input
type="color"
value={element.color || "#ffffff"}
onChange={(e) => {
const color = e.target.value;
updateTextElement(trackId, element.id, { color });
}}
className="w-full cursor-pointer rounded-full"
/>
</PropertyItemValue>
</PropertyItem>
</div>
);
}