Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:fork/kirby-starterkit into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jeslage committed Apr 15, 2023
2 parents a92a4a1 + 3ff1285 commit 13f8225
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion site/snippets/components/link.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<?php if ($icon) : ?>
<div class="w-m ml-xs">
<?= svg('assets/icons/' . $icon . '.svg') ?>
<?= svg('assets/icons/'.$icon.'.svg') ?>
</div>
<?php endif; ?>
</<?= $tag ?>>
2 changes: 1 addition & 1 deletion site/snippets/components/pagination.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
<?php endif; ?>

<p class="copy font-bold"><?= $pagination->page() . ' / ' . $pagination->pages() ?></p>
<p class="copy font-bold"><?= $pagination->page().' / '.$pagination->pages() ?></p>

<?php if ($pagination->hasNextPage()) : ?>
<a href="<?= $pagination->nextPageUrl() ?>" class="block w-s">
Expand Down
26 changes: 13 additions & 13 deletions site/snippets/components/stage.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@
<div class="col-span-4 md:col-span-12 aspect-w-16 aspect-h-9 mb-l">
<?=
snippet('image', [
'image' => $image,
'class' => 'blog',
'src' => [
'width' => 1600,
'height' => 900,
'quality' => 80,
'crop' => 'center',
],
'srcset' => [
'1200w' => ['width' => 1200, 'height' => 675, 'crop' => 'center', 'quality' => 80],
],
'sizes' => '(min-width: 1200px) 1200px, 100vw',
'image' => $image,
'class' => 'blog',
'src' => [
'width' => 1600,
'height' => 900,
'quality' => 80,
'crop' => 'center',
],
'srcset' => [
'1200w' => ['width' => 1200, 'height' => 675, 'crop' => 'center', 'quality' => 80],
],
'sizes' => '(min-width: 1200px) 1200px, 100vw',
])
?>
</div>
Expand All @@ -49,7 +49,7 @@
<div class="flex mt-s gap-xs">
<?php foreach ($tags as $tag) : ?>
<?php snippet('components/tag', [
'text' => $tag,
'text' => $tag,
]) ?>
<?php endforeach ?>
</div>
Expand Down
28 changes: 14 additions & 14 deletions site/snippets/components/teaser.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
<?php if ($image) : ?>
<?=
snippet('image', [
'image' => $image,
'class' => 'blog',
'src' => [
'width' => 1600,
'height' => 900,
'quality' => 80,
'crop' => 'center',
],
'srcset' => [
'1200w' => ['width' => 1200, 'height' => 675, 'crop' => 'center', 'quality' => 80],
],
'sizes' => '(min-width: 1200px) 1200px, 100vw',
'image' => $image,
'class' => 'blog',
'src' => [
'width' => 1600,
'height' => 900,
'quality' => 80,
'crop' => 'center',
],
'srcset' => [
'1200w' => ['width' => 1200, 'height' => 675, 'crop' => 'center', 'quality' => 80],
],
'sizes' => '(min-width: 1200px) 1200px, 100vw',
])
?>
?>
<?php endif; ?>
</div>

Expand All @@ -44,7 +44,7 @@
<?php endif; ?>

<?php snippet('components/link', [
'text' => t('readMore'),
'text' => t('readMore'),
]) ?>
</a>
</article>
20 changes: 10 additions & 10 deletions site/snippets/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<?php foreach ($site->footerNavigation()->toStructure() as $item) : ?>
<li>
<?php snippet('components/link', [
'text' => $item->text(),
'href' => $item->url(),
'target' => $item->popup()->toBool(), '_blank', '_self',
'current' => $item->url()->value() === kirby()->url('current'),
'text' => $item->text(),
'href' => $item->url(),
'target' => $item->popup()->toBool(), '_blank', '_self',
'current' => $item->url()->value() === kirby()->url('current'),
]) ?>
</li>
<?php endforeach ?>
Expand All @@ -31,26 +31,26 @@
<?php foreach ($site->metaNavigation()->toStructure() as $item) : ?>
<li>
<?php snippet('components/link', [
'text' => $item->text(),
'href' => $item->url(),
'target' => $item->popup()->toBool(), '_blank', '_self',
'current' => $item->url()->value() === kirby()->url('current'),
'text' => $item->text(),
'href' => $item->url(),
'target' => $item->popup()->toBool(), '_blank', '_self',
'current' => $item->url()->value() === kirby()->url('current'),
]) ?>
</li>
<?php endforeach ?>
</ul>
<?php endif ?>

<div class="mt-l">
<p class="copy"><?= '<b>©' . date('Y') . '</b> ' . $site->title() ?></p>
<p class="copy"><?= '<b>©'.date('Y').'</b> '.$site->title() ?></p>
</div>
</nav>

<?php if ($site->socialMedia()->isNotEmpty()) : ?>
<div class="flex gap-m mt-l col-span-4 md:mt-auto">
<?php foreach ($site->socialMedia()->toStructure() as $social) : ?>
<a href="<?php echo $social->url(); ?>" target="_blank" rel="noopener noreferrer" class="w-l block hover:text-interaction-50 focus:text-interaction-50">
<?= svg('assets/icons/' . $social->service() . '.svg') ?>
<?= svg('assets/icons/'.$social->service().'.svg') ?>
</a>
<?php endforeach ?>
</div>
Expand Down
8 changes: 4 additions & 4 deletions site/snippets/header.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
<?php foreach ($site->navigation()->toStructure() as $item) : ?>
<li>
<?php snippet('components/link', [
'text' => $item->text(),
'href' => $item->url(),
'target' => $item->popup()->toBool(), '_blank', '_self',
'current' => $item->url()->value() === kirby()->url('current'),
'text' => $item->text(),
'href' => $item->url(),
'target' => $item->popup()->toBool(), '_blank', '_self',
'current' => $item->url()->value() === kirby()->url('current'),
]) ?>
</li>
<?php endforeach ?>
Expand Down

0 comments on commit 13f8225

Please sign in to comment.