From 281da146444b8a9b8aa9c5e5114bd253383ec83f Mon Sep 17 00:00:00 2001 From: Jordy de Vulder Date: Tue, 17 Dec 2024 17:33:32 +0100 Subject: [PATCH 01/24] Changed buttons and prevent scroll --- resources/views/components/button/button.blade.php | 2 +- resources/views/components/button/conversion.blade.php | 2 +- resources/views/components/button/primary.blade.php | 2 +- resources/views/components/button/secondary.blade.php | 2 +- resources/views/components/slideover/slideover.blade.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/components/button/button.blade.php b/resources/views/components/button/button.blade.php index 3731264..1b8f81f 100644 --- a/resources/views/components/button/button.blade.php +++ b/resources/views/components/button/button.blade.php @@ -7,6 +7,6 @@ Something ``` --}} -twMerge('relative inline-flex items-center justify-center text transition bg text-base font-medium rounded min-h-12 py-1.5 px-5 hover:bg-opacity-80 border-b border-b-black/15 disabled:text-muted disabled:bg-muted disabled:cursor-not-allowed') }}> +twMerge('relative inline-flex items-center justify-center text transition bg text-base font-medium rounded min-h-12 py-1.5 px-5 hover:bg-opacity-80 disabled:text-muted disabled:bg-muted disabled:cursor-not-allowed') }}> {{ $slot }} diff --git a/resources/views/components/button/conversion.blade.php b/resources/views/components/button/conversion.blade.php index c600204..fc176c1 100644 --- a/resources/views/components/button/conversion.blade.php +++ b/resources/views/components/button/conversion.blade.php @@ -7,6 +7,6 @@ Something ``` --}} -twMerge('bg-conversion text-conversion-text') }}> +twMerge('bg-conversion text-conversion-text border-b border-b-black/15') }}> {{ $slot }} diff --git a/resources/views/components/button/primary.blade.php b/resources/views/components/button/primary.blade.php index 7be892d..b4c3131 100644 --- a/resources/views/components/button/primary.blade.php +++ b/resources/views/components/button/primary.blade.php @@ -3,6 +3,6 @@ Something ``` --}} -twMerge('bg-primary text-primary-text') }}> +twMerge('bg-primary text-primary-text border-b border-b-black/15') }}> {{ $slot }} diff --git a/resources/views/components/button/secondary.blade.php b/resources/views/components/button/secondary.blade.php index 99ae33c..3821ec5 100644 --- a/resources/views/components/button/secondary.blade.php +++ b/resources/views/components/button/secondary.blade.php @@ -3,6 +3,6 @@ Something ``` --}} -twMerge('bg-secondary text-secondary-text') }}> +twMerge('bg-secondary text-secondary-text border-b border-b-black/15') }}> {{ $slot }} \ No newline at end of file diff --git a/resources/views/components/slideover/slideover.blade.php b/resources/views/components/slideover/slideover.blade.php index 4b48865..627a50b 100644 --- a/resources/views/components/slideover/slideover.blade.php +++ b/resources/views/components/slideover/slideover.blade.php @@ -17,7 +17,7 @@ ## Body Class Add this class to prevent scrolling when slideover is open: ```html - + ``` ## Nesting Slideovers @@ -77,7 +77,7 @@ @if (!$hasParent) - +