From 623a704bdbd995e165331e7196836b63e0fc1a84 Mon Sep 17 00:00:00 2001 From: NiclasNorin Date: Fri, 3 May 2024 16:02:26 +0200 Subject: [PATCH 1/2] feat: nav component unique button styling --- source/php/Component/Button/button.json | 2 +- source/php/Component/Nav/style/button.blade.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/php/Component/Button/button.json b/source/php/Component/Button/button.json index 7531e668..1cf843c3 100644 --- a/source/php/Component/Button/button.json +++ b/source/php/Component/Button/button.json @@ -51,7 +51,7 @@ "type": "string", "style": "string", "shape": "string", - "href": "string", + "href": "string|NULL", "target": "string", "componentElement":"string", "labelElement":"string", diff --git a/source/php/Component/Nav/style/button.blade.php b/source/php/Component/Nav/style/button.blade.php index 29f5e0a7..d0649eee 100644 --- a/source/php/Component/Nav/style/button.blade.php +++ b/source/php/Component/Nav/style/button.blade.php @@ -3,9 +3,9 @@ 'icon' => isset($item['icon']['icon']) ? $item['icon']['icon'] : false, 'reversePositions' => true, 'text' => $item['label'], - 'style' => $buttonStyle, - 'color' => $buttonColor, - 'href' => $item['href'], + 'style' => $item['buttonStyle'] ?? $buttonStyle, + 'color' => $item['buttonColor'] ?? $buttonColor, + 'href' => strlen($item['href']) <= 1 ? null : $item['href'], 'classList' => [ $baseClass . '__button', ], From 994133179c3cebffb833cf46d1191c30ef633e31 Mon Sep 17 00:00:00 2001 From: NiclasNorin Date: Fri, 3 May 2024 16:10:27 +0200 Subject: [PATCH 2/2] fix: remove calculation of href --- source/php/Component/Nav/style/button.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/php/Component/Nav/style/button.blade.php b/source/php/Component/Nav/style/button.blade.php index d0649eee..96779583 100644 --- a/source/php/Component/Nav/style/button.blade.php +++ b/source/php/Component/Nav/style/button.blade.php @@ -5,7 +5,7 @@ 'text' => $item['label'], 'style' => $item['buttonStyle'] ?? $buttonStyle, 'color' => $item['buttonColor'] ?? $buttonColor, - 'href' => strlen($item['href']) <= 1 ? null : $item['href'], + 'href' => $item['href'], 'classList' => [ $baseClass . '__button', ],