fix: resolve issue with missing margin.

helsingborg-stad · Oct 2, 2024 · 13d3f9e · 13d3f9e
1 parent e1aba77
commit 13d3f9e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 13 deletions.
diff --git a/source/php/Module/Posts/Posts.php b/source/php/Module/Posts/Posts.php
@@ -5,6 +5,9 @@
 use Municipio\Helper\Image as ImageHelper;
 use Modularity\Module\Posts\Helper\GetArchiveUrl as ArchiveUrlHelper;
 use Modularity\Module\Posts\Helper\GetPosts as GetPostsHelper;
+use Modularity\Integrations\Component\ImageResolver;
+use Modularity\Integrations\Component\ImageFocusResolver;
+use ComponentLibrary\Integrations\Image\Image as ImageComponentContract;
 
 /**
  * Class Posts

diff --git a/source/php/Module/Posts/views/features-grid.blade.php b/source/php/Module/Posts/views/features-grid.blade.php
@@ -1,7 +1,7 @@
 @includeWhen(!$hideTitle && !empty($postTitle), 'partials.post-title')
 @includeWhen($preamble, 'partials.preamble')
 
-<div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}"
+<div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}{{ (!empty($preamble)||(!$hideTitle && !empty($postTitle))) ? ' u-margin__top--4' : '' }}"
     aria-labelledby="{{ 'mod-posts-' . $ID . '-label' }}">
     @if($posts)
         @foreach ($posts as $post)

diff --git a/source/php/Module/Posts/views/grid.blade.php b/source/php/Module/Posts/views/grid.blade.php
@@ -1,7 +1,7 @@
 @includeWhen(!$hideTitle && !empty($postTitle), 'partials.post-title')
 @includeWhen($preamble, 'partials.preamble')
-
-<div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}"
+abc
+<div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}{{ (!empty($preamble)||(!$hideTitle && !empty($postTitle))) ? ' u-margin__top--4' : '' }}"
     @if (!$hideTitle && !empty($postTitle)) aria-labelledby="{{ 'mod-posts-' . $ID . '-label' }}" @endif>
     @if($posts)
         @foreach ($posts as $post)

diff --git a/source/php/Module/Posts/views/index.blade.php b/source/php/Module/Posts/views/index.blade.php
@@ -1,7 +1,7 @@
 @includeWhen(!$hideTitle && !empty($postTitle), 'partials.post-title')
 @includeWhen($preamble, 'partials.preamble')
 
-<div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}"
+<div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}{{ (!empty($preamble)||(!$hideTitle && !empty($postTitle))) ? ' u-margin__top--4' : '' }}"
 @if (!$hideTitle && !empty($postTitle)) aria-labelledby="{{ 'mod-posts-' . $ID . '-label' }}" @endif>
     @if($posts)    
         @foreach ($posts as $post)

diff --git a/source/php/Module/Posts/views/partials/post/block.blade.php b/source/php/Module/Posts/views/partials/post/block.blade.php
@@ -6,14 +6,11 @@
     'secondaryMeta' => $post->readingTime,
     'date' => $post->postDateFormatted,
     'dateBadge' => $post->dateBadge,
-    'filled' => true,
     'image' => $post->image,
-    'hasPlaceholder' => $post->hasPlaceholderImage,
+    //'hasPlaceholder' => $post->hasPlaceholderImage,
     'classList' => ['t-posts-block', ' u-height--100'],
     'context' => ['module.posts.block'],
     'link' => $post->permalink,
-    'postId' => $post->id,
-    'postType' => $post->postType ?? '',
     'icon' => $post->termIcon,
     'attributeList' => array_merge($post->attributeList, []),
 ])

diff --git a/source/php/Module/Posts/views/partials/post/card.blade.php b/source/php/Module/Posts/views/partials/post/card.blade.php
@@ -1,6 +1,5 @@
 @card([
     'link' => $post->permalink,
-    'imageFirst' => true,
     'heading' => $post->postTitle,
     'context' => ['module.posts.index'],
     'content' => $post->excerptShort,
@@ -10,11 +9,8 @@
     'dateBadge' => $post->dateBadge,
     'classList' => ['u-height--100'],
     'containerAware' => true,
-    'hasAction' => true,
     'hasPlaceholder' => $post->hasPlaceholderImage,
     'image' => $post->image,
-    'postId' => $post->id,
-    'postType' => $post->postType,
     'icon' => $post->termIcon,
     'attributeList' => array_merge($post->attributeList, []),
 ])

diff --git a/source/php/Module/Posts/views/segment.blade.php b/source/php/Module/Posts/views/segment.blade.php
@@ -1,7 +1,8 @@
 @includeWhen(!$hideTitle && !empty($postTitle), 'partials.post-title')
 @includeWhen($preamble, 'partials.preamble')
+
 @if($posts)
-    <div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}"
+    <div class="o-grid{{ !empty($stretch) ? ' o-grid--stretch' : '' }}{{ !empty($noGutter) ? ' o-grid--no-gutter' : '' }}{{ (!empty($preamble)||(!$hideTitle && !empty($postTitle))) ? ' u-margin__top--4' : '' }}"
         @if (!$hideTitle && !empty($postTitle)) aria-labelledby="{{ 'mod-posts-' . $ID . '-label' }}" @endif>
         @foreach ($posts as $post)
             <div class="{{ $posts_columns }}">