Commit 975b967

authored

Merge pull request #1884 from iamfaran/fix/1466-button-border-disabled

[Fix]: #1466 border color for disabled button

2 parents 510cb60 + 93eb77a commit 975b967Copy full SHA for 975b967

File tree

+11

-9

lines changed

client/packages/lowcoder/src/comps/comps
- buttonComp
  - buttonCompConstants.tsx
- meetingComp
  - videobuttonCompConstants.tsx

+11

-9

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ export function getButtonStyle(buttonStyle: ButtonStyleType, disabledStyle: Disa`
`54`	`54`	`&.ant-btn-disabled {`
`55`	`55`	`color: ${disabledStyle.disabledText};`
`56`	`56`	`background: ${disabledStyle.disabledBackground};`
	`57`	`+ border-color: ${disabledStyle.disabledBorder};`
`57`	`58`	`cursor: not-allowed;`
`58`	`59`	`}`
`59`	`60`	`}`

Lines changed: 10 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ export function getButtonStyle(buttonStyle: any, disabledStyle: any) {`
`48`	`48`	`&.ant-btn-disabled {`
`49`	`49`	`color: ${disabledStyle.disabledText};`
`50`	`50`	`background: ${disabledStyle.disabledBackground};`
	`51`	`+ border-color: ${disabledStyle.disabledBorder};`
`51`	`52`	`cursor: not-allowed;`
`52`	`53`	`}`
`53`	`54`	`}`
`@@ -70,15 +71,15 @@ export const Button100 = styled(Button)<{ $buttonStyle?: any; $disabledStyle?: a`
`70`	`71`	`;
`71`	`72`
`72`	`73`	export const ButtonCompWrapper = styled.div<{ disabled: boolean }>`
`73`		`- // The button component is disabled but can respond to drag & select events`
`74`		`- ${(props)=>`
`75`		`- props.disabled&&`
`76`		- `
`77`		`- cursor: not-allowed;`
`78`		`- button:disabled {`
`79`		`- pointer-events: none;`
`80`		`- }`
`81`		- `};
	`74`	`+ ${(props)=>`
	`75`	`+ props.disabled`
	`76`	+ ? css`
	`77`	`+ cursor: not-allowed;`
	`78`	`+ button:disabled {`
	`79`	`+ pointer-events: none;`
	`80`	`+ }`
	`81`	+ `
	`82`	`+ : ''};`
`82`	`83`	`;
`83`	`84`
`84`	`85`	`/**`

Comments

(0)