Commit c9ca7b5

authored

Merge branch 'main' into fix-container-height-reset-on-child-delete

2 parents 75dd925 + a770a42 commit c9ca7b5Copy full SHA for c9ca7b5

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,14 +91,15 @@ const TimelineComp = (`
`91`	`91`	`return (`
`92`	`92`	`<div`
`93`	`93`	`style={{`
`94`		`- margin: style.margin,`
`95`		`- padding: style.padding,`
`96`		`- width: widthCalculator(style.margin),`
`97`		`- height: heightCalculator(style.margin),`
	`94`	`+ margin: style.margin??'3px',`
	`95`	`+ padding: style.padding??'3px',`
	`96`	`+ width: widthCalculator(style.margin??'3px'),`
	`97`	`+ height: heightCalculator(style.margin??'3px'),`
`98`	`98`	`background: style.background,`
`99`	`99`	`overflow: "auto",`
`100`	`100`	`overflowX: "hidden",`
`101`	`101`	`borderRadius: style.radius,`
	`102`	`+ //height: '100%'`
`102`	`103`	`}}`
`103`	`104`	`>`
`104`	`105`	`<Timeline`

Comments

(0)