Commita6685f9

authored

Merge pull request#635 from lowcoder-org/dev

Dev -> update feature branch

2 parentse1e8b3b +96da6e4 commita6685f9Copy full SHA for a6685f9

File tree

-3

lines changed

client/packages
- lowcoder-design/src/components/colorSelect
  - index.tsx
- lowcoder/src/comps/queries
  - resourceDropdown.tsx

-3

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ export const ColorSelect = (props: ColorSelectProps) => {`
`31`	`31`	`},200),`
`32`	`32`	`[dispatch]`
`33`	`33`	`);`
`34`		`-`
`35`	`34`	`return(`
`36`	`35`	`<Popover`
`37`	`36`	`trigger={trigger}`
`@@ -170,7 +169,7 @@ const BackDiv = styled.div.attrs<{ $color: string }>((props: { $color: string })`
`170`	`169`	`;
`171`	`170`	`// main block`
`172`	`171`	constColorBlock=styled.div<{$color:string}>`
`173`		`- background-color:${(props)=>(isValidColor(props.$color) ?props.color :"#FFFFFF")};`
	`172`	`+ background-color:${(props)=>(isValidColor(props.$color) ?props.$color :"#FFFFFF")};`
`174`	`173`	`border: 1px solid rgba(0, 0, 0, 0.1);`
`175`	`174`	`border-radius: 4px;`
`176`	`175`	`height: 24px;`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -39,7 +39,7 @@ const SelectOptionContains = styled.div`
`39`	`39`	`align-items: center;`
`40`	`40`	`width: 99%;`
`41`	`41`	`;
`42`		-constSelectOption=styled((props:OptionProps)=><Option{...props}/>)`
	`42`	+constSelectOption=styled(Option)`
`43`	`43`	`display: flex;`
`44`	`44`	`justify-content: space-between;`
`45`	`45`

Comments

(0)