From 6e9548ceec17143e5161cc18d78d9c708515c496 Mon Sep 17 00:00:00 2001 From: Stephen Cameron Date: Tue, 14 Jan 2020 15:20:20 +0100 Subject: [PATCH] WIP #3332 @1.5 --- config/markdown.php | 2 +- resources/views/pages/cart.blade.php | 2 +- resources/views/pages/home.blade.php | 6 +++--- resources/views/pages/text.blade.php | 3 +-- resources/views/partials/intro.blade.php | 3 ++- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/config/markdown.php b/config/markdown.php index dc809bf..aa94f1e 100644 --- a/config/markdown.php +++ b/config/markdown.php @@ -163,6 +163,6 @@ return [ 'max_nesting_level' => INF, 'heading_offset' => 1, - 'hading_max' => 6 + 'heading_max' => 6 ]; diff --git a/resources/views/pages/cart.blade.php b/resources/views/pages/cart.blade.php index c438b47..03a650a 100644 --- a/resources/views/pages/cart.blade.php +++ b/resources/views/pages/cart.blade.php @@ -3,7 +3,7 @@ @section('content') - +
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php index b399a47..4946686 100644 --- a/resources/views/pages/home.blade.php +++ b/resources/views/pages/home.blade.php @@ -26,7 +26,7 @@
- +

{!! nl2br($slide['text']) !!}

@@ -56,7 +56,7 @@ {{-- Intro text --}} - @intro(['padding' => 'pt-5v pb-4v']) + @intro(['title_tag' => 'h2', 'padding' => 'pt-5v pb-4v']) {{-- Our products --}} @@ -114,7 +114,7 @@ {{-- Services & Support --}} - @intro(['name' => 'services_support', 'class' => 'bg-grey-100']) + @intro(['name' => 'services_support', 'title_tag' => 'h2', 'class' => 'bg-grey-100']) @if(config('features.news') && count($news) > 0) {{-- News --}} diff --git a/resources/views/pages/text.blade.php b/resources/views/pages/text.blade.php index 3abde2b..2ae7ff5 100644 --- a/resources/views/pages/text.blade.php +++ b/resources/views/pages/text.blade.php @@ -2,11 +2,10 @@ @section('content') - @markdown($page->get('content')) - + @endsection diff --git a/resources/views/partials/intro.blade.php b/resources/views/partials/intro.blade.php index 0a75780..04d8074 100644 --- a/resources/views/partials/intro.blade.php +++ b/resources/views/partials/intro.blade.php @@ -5,6 +5,7 @@ $name = $name ?? 'intro'; $title = \Illuminate\Support\Str::ucfirst($page->get("$name.title", $page->get("name"))); + $title_tag = $title_tag ?? 'h1'; $image = $page->getImageURL("$name.image",'',asset('storage/uploads/images/products-intro.jpg')); $class = $class ?? ''; $padding = $padding ?? null; // Pass null so it doesn't override default padding @@ -22,7 +23,7 @@ - +

@markdown($page->get("$name.text"))

@if ($button) -- 2.39.5