Skip to content

Commit 60f62f1

Browse files
authored
Add disabled attribute after merge conflict
1 parent b2d1eb1 commit 60f62f1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

packages/uui-color-picker/lib/uui-color-picker.element.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,6 +680,7 @@ export class UUIColorPickerElement extends LabelMixin('label', LitElement) {
680680
this.lightness
681681
}%, ${this.alpha / 100})`,
682682
})}
683+
?disabled=${this.disabled}
683684
@click=${this.openColorPicker}
684685
aria-haspopup="true"
685686
aria-expanded="false"></button>

0 commit comments

Comments
 (0)