Commitc3a249e

authored

Merge branch 'lowcoder-org:dev' into dev

2 parents4db4036 +f55bc6e commitc3a249eCopy full SHA for c3a249e

File tree

+24

-11

lines changed

+24

-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`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,26 @@`
`270`	`270`	`<configuration>`
`271`	`271`	`<outputDirectory>${assembly.lib.directory}</outputDirectory>`
`272`	`272`	`<includeScope>runtime</includeScope>`
	`273`	`+<excludeArtifactIds>rjson</excludeArtifactIds>`
	`274`	`+</configuration>`
	`275`	`+</execution>`
	`276`	`+<execution>`
	`277`	`+<id>copy-rjson-snapshot</id>`
	`278`	`+<phase>package</phase>`
	`279`	`+<goals>`
	`280`	`+<goal>copy</goal>`
	`281`	`+</goals>`
	`282`	`+<configuration>`
	`283`	`+<artifactItems>`
	`284`	`+<artifactItem>`
	`285`	`+<groupId>tv.twelvetone.rjson</groupId>`
	`286`	`+<artifactId>rjson</artifactId>`
	`287`	`+<version>LATEST</version>`
	`288`	`+<overWrite>true</overWrite>`
	`289`	`+<outputDirectory>${assembly.lib.directory}</outputDirectory>`
	`290`	`+</artifactItem>`
	`291`	`+</artifactItems>`
	`292`	`+<useBaseVersion>false</useBaseVersion>`
`273`	`293`	`</configuration>`
`274`	`294`	`</execution>`
`275`	`295`	`</executions>`

Comments

(0)