Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mwpw-147034: Custom border color + badge/border color decoupling [Mer… #15

Merged
merged 8 commits into from
Jul 23, 2024
Merged

Mwpw-147034: Custom border color + badge/border color decoupling [Mer… #15

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0c50e78
Mwpw-147034: Custom border color + badge/border color decoupling [Mer…
Axelcureno Jun 24, 2024
fad63bf
Merge branch 'main' into MWPW-147034
Axelcureno Jun 25, 2024
438e113
Merge branch 'main' into MWPW-147034
Axelcureno Jul 9, 2024
1fe2ded
unit tests and getter for custom border color
Axelcureno Jul 9, 2024
8599cf1
updated libs
Axelcureno Jul 9, 2024
caa1291
Merge branch 'main' into MWPW-147034
Axelcureno Jul 12, 2024
f736e92
Merge branch 'main' into MWPW-147034
mirafedas Jul 22, 2024
23f3132
Merge branch 'main' into MWPW-147034
Axelcureno Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions web-components/src/merch-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ export class MerchCard extends LitElement {
variant: { type: String, reflect: true },
size: { type: String, attribute: 'size', reflect: true },
badgeColor: { type: String, attribute: 'badge-color' },
borderColor: { type: String, attribute: 'border-color' },
badgeBackgroundColor: {
type: String,
attribute: 'badge-background-color',
Expand Down Expand Up @@ -110,10 +111,12 @@ export class MerchCard extends LitElement {

updated(changedProperties) {
if (
changedProperties.has('badgeBackgroundColor') &&
(changedProperties.has('badgeBackgroundColor') || changedProperties.has('borderColor')) &&
Axelcureno marked this conversation as resolved.
Show resolved Hide resolved
this.variant !== 'twp'
) {
this.style.border = `1px solid ${this.badgeBackgroundColor}`;
this.style.border = `1px solid ${
this.borderColor ? this.borderColor : this.badgeBackgroundColor
}`;
Axelcureno marked this conversation as resolved.
Show resolved Hide resolved
}
this.updateComplete.then(async () => {
const prices = Array.from(
Expand Down