Commit34f09be

authored

Merge branch 'dev' into master

2 parents3653119 +f55bc6e commit34f09beCopy full SHA for 34f09be

File tree

-11

lines changed

-11

lines changed

Lines changed: 4 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -277,15 +277,15 @@ const TEXT = {`
`277`	`277`	`constSTATIC_TEXT={`
`278`	`278`	`name:"staticText",`
`279`	`279`	`label:trans("style.staticText"),`
`280`		`-depTheme:"canvas",`
	`280`	`+depTheme:"primarySurface",`
`281`	`281`	`depType:DEP_TYPE.CONTRAST_TEXT,`
`282`	`282`	`transformer:contrastText,`
`283`	`283`	`}asconst;`
`284`	`284`
`285`	`285`	`constLABEL={`
`286`	`286`	`name:"label",`
`287`	`287`	`label:trans("label"),`
`288`		`-depTheme:"canvas",`
	`288`	`+depTheme:"primarySurface",`
`289`	`289`	`depType:DEP_TYPE.CONTRAST_TEXT,`
`290`	`290`	`transformer:contrastText,`
`291`	`291`	`}asconst;`
`@@ -562,7 +562,7 @@ function replaceAndMergeMultipleStyles(originalArray: any[], styleToReplace: str`
`562`	`562`	`}`
`563`	`563`
`564`	`564`	`exportconstButtonStyle=[`
`565`		`-getBackground('primary'),`
	`565`	`+getBackground(),`
`566`	`566`	`...STYLING_FIELDS_SEQUENCE`
`567`	`567`	`]asconst;`
`568`	`568`
`@@ -1304,14 +1304,7 @@ function handleToHoverLink(color: string) {`
`1304`	`1304`	`}`
`1305`	`1305`
`1306`	`1306`	`exportconstLinkStyle=[`
`1307`		`-`
`1308`		`-{`
`1309`		`-name:"background",`
`1310`		`-label:trans("style.background"),`
`1311`		`-depTheme:"canvas",`
`1312`		`-depType:DEP_TYPE.SELF,`
`1313`		`-transformer:toSelf,`
`1314`		`-},`
	`1307`	`+getBackground(),`
`1315`	`1308`	`...replaceAndMergeMultipleStyles(STYLING_FIELDS_SEQUENCE,'text',[...LinkTextStyle])`
`1316`	`1309`	`]asconst;`
`1317`	`1310`

Comments

(0)