Merge pull request #8 from apility/dev

Adds url() helper to button href
apility · Mar 12, 2024 · 19ed274 · 19ed274
2 parents 3bc8074 + 3608131
commit 19ed274
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/config/newsletter-foundation.php b/config/newsletter-foundation.php
@@ -58,7 +58,7 @@
 
     'button' => [
         'sizes' => [
-            'small' => 'Litem',
+            'small' => 'Liten',
             'medium' => 'Medium',
             'large' => 'Stor',
         ],
@@ -74,7 +74,7 @@
         ],
     ],
 
-     /*
+    /*
     |--------------------------------------------------------------------------
     | Image formats
     |--------------------------------------------------------------------------

diff --git a/resources/views/components/button-row.blade.php b/resources/views/components/button-row.blade.php
@@ -65,7 +65,7 @@
 
       <x-netflex-newsletter-foundation::button
         text="{!! $button->name !!}"
-        href="{{ content($hash.'_link') ?  content($hash.'_link')->url : '#' }}"
+        href="{{ content($hash.'_link') ?  content($hash.'_link')->url : '/' }}"
         background="{{ content($hash.'_color') ?? config('newsletter-foundation.defaults.button.background') }}"
         color="{{ get_newsletter_text_color(content($hash.'_color') ?? config('newsletter-foundation.defaults.button.background')) }}"
         padding="{{ get_newsletter_button_padding(content($hash.'_size') ?? config('newsletter-foundation.defaults.button.padding')) }}"

diff --git a/resources/views/components/button.blade.php b/resources/views/components/button.blade.php
@@ -1,5 +1,5 @@
 @props([
-    'href' => '#',
+    'href' => '/',
     'background' => config('newsletter-foundation.defaults.button.background'),
     'color' => get_newsletter_text_color(config('newsletter-foundation.defaults.button.background')),
     'padding' => config('newsletter-foundation.button.padding.'.config('newsletter-foundation.defaults.button.padding')),
@@ -20,7 +20,7 @@
     rel="noopener"
     class="{{ $class }}"
     target="_blank"
-    href="{{ $href }}"
+    href="{{ url($href) }}"
     style="background-color: {{ content('color') ?? $background }}; font-size: {{ $fontSize }}; font-weight: {{ $fontWeight }}; padding: {{ $padding }}; color: {{ $color }}; border-radius: {{ $borderRadius }}; border: {{ $border }}; text-decoration:none; display: {{ $display }}; mso-padding-alt: 0; text-align:center;">
     <!--[if mso]>
   <i style="letter-spacing: 15px; mso-font-width: -100%; mso-text-raise: 20pt;">&nbsp;</i>