From 9b72c1c3d77d1d80921574a9f852ad87b6ad02f2 Mon Sep 17 00:00:00 2001 From: Daniel Paiva Date: Wed, 22 May 2024 04:18:53 -0300 Subject: [PATCH 1/5] Utilizar branco quando cor for transparente --- src/components/sq-button/sq-button.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/sq-button/sq-button.component.ts b/src/components/sq-button/sq-button.component.ts index 77e7298..3c71a55 100644 --- a/src/components/sq-button/sq-button.component.ts +++ b/src/components/sq-button/sq-button.component.ts @@ -239,9 +239,9 @@ export class SqButtonComponent { */ setHoverBg() { if (this.invertedHover) { - return this.setHover(this.textColor || '') + return this.setHover(this.textColor !== 'transparent' ? this.textColor || '' : 'var(--white-html)') } - return this.setHover(this.color) + return this.setHover(this.color !== 'transparent' ? this.color : 'var(--white-html)') } /** @@ -250,6 +250,7 @@ export class SqButtonComponent { */ setHoverText() { if (this.invertedHover) { + console.log('hoverText:', this.setHover(this.color !== 'transparent' ? this.color : 'var(--white-html)') ) return this.setHover(this.color !== 'transparent' ? this.color : 'var(--white-html)') } return this.setHover(this.textColor !== 'transparent' ? this.textColor || '' : 'var(--white-html)') From 584c84f4b485f90b15bd005b8cfd168d674e7e01 Mon Sep 17 00:00:00 2001 From: Daniel Paiva Date: Wed, 22 May 2024 04:20:23 -0300 Subject: [PATCH 2/5] =?UTF-8?q?Fix:=20Retornar=20cores=20n=C3=A3o=20hexade?= =?UTF-8?q?cimais?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/helpers/colors.helper.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/helpers/colors.helper.ts b/src/helpers/colors.helper.ts index 13c7639..346abca 100644 --- a/src/helpers/colors.helper.ts +++ b/src/helpers/colors.helper.ts @@ -60,6 +60,15 @@ export class ColorsHelper { .join('') } + const isHexColor = (value: string): boolean => { + const hexColorRegex = /^([a-fA-F0-9]{3}|[a-fA-F0-9]{6})$/ + return hexColorRegex.test(value) + } + + if (!isHexColor(colorWithoutHash)) { + return colorWithoutHash + } + const getColorChannel = (substring: string): string => { let colorChannel = Math.max(Math.min(255, parseInt(substring, 16) + amount), 0).toString(16) if (colorChannel?.length < 2) { From 09e759ebab252f90fed22d028fa3a2996432df6f Mon Sep 17 00:00:00 2001 From: Daniel Paiva Date: Wed, 22 May 2024 04:34:59 -0300 Subject: [PATCH 3/5] =?UTF-8?q?Remo=C3=A7=C3=A3o=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/sq-button/sq-button.component.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/sq-button/sq-button.component.ts b/src/components/sq-button/sq-button.component.ts index 3c71a55..b37c925 100644 --- a/src/components/sq-button/sq-button.component.ts +++ b/src/components/sq-button/sq-button.component.ts @@ -250,7 +250,6 @@ export class SqButtonComponent { */ setHoverText() { if (this.invertedHover) { - console.log('hoverText:', this.setHover(this.color !== 'transparent' ? this.color : 'var(--white-html)') ) return this.setHover(this.color !== 'transparent' ? this.color : 'var(--white-html)') } return this.setHover(this.textColor !== 'transparent' ? this.textColor || '' : 'var(--white-html)') From fbe6c9c78f20ccd6bb3485517509654a96426c22 Mon Sep 17 00:00:00 2001 From: Daniel Paiva Date: Wed, 22 May 2024 13:21:48 -0300 Subject: [PATCH 4/5] Ajuste de cores --- src/components/sq-button/sq-button.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/sq-button/sq-button.component.ts b/src/components/sq-button/sq-button.component.ts index b37c925..b82b2a1 100644 --- a/src/components/sq-button/sq-button.component.ts +++ b/src/components/sq-button/sq-button.component.ts @@ -239,9 +239,9 @@ export class SqButtonComponent { */ setHoverBg() { if (this.invertedHover) { - return this.setHover(this.textColor !== 'transparent' ? this.textColor || '' : 'var(--white-html)') + return this.setHover(this.textColor !== 'transparent' ? this.textColor || '' : 'var(--text_color)') } - return this.setHover(this.color !== 'transparent' ? this.color : 'var(--white-html)') + return this.setHover(this.color !== 'transparent' ? this.color : 'var(--color_bg_button_inverse-hover)') } /** @@ -250,9 +250,9 @@ export class SqButtonComponent { */ setHoverText() { if (this.invertedHover) { - return this.setHover(this.color !== 'transparent' ? this.color : 'var(--white-html)') + return this.setHover(this.color !== 'transparent' ? this.color : 'var(--color_bg_button_inverse-hover)') } - return this.setHover(this.textColor !== 'transparent' ? this.textColor || '' : 'var(--white-html)') + return this.setHover(this.textColor !== 'transparent' ? this.textColor || '' : 'var(--text_color)') } /** From 23e2d0414da9651bbdf47eccc5bf63a409d7b616 Mon Sep 17 00:00:00 2001 From: Daniel Paiva Date: Wed, 22 May 2024 13:44:42 -0300 Subject: [PATCH 5/5] =?UTF-8?q?Bump=20vers=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 9333f65..84bd502 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { "name": "@squidit/ngx-css", - "version": "1.3.33", + "version": "1.3.34", "peerDependencies": { "@angular/common": ">=15.0.0", "@angular/core": ">=15.0.0",