Merge branch 'main' of github.com:getkirby/starterkit into main

This commit is contained in:
Bastian Allgeier
2022-02-01 11:42:45 +01:00
5 changed files with 9 additions and 11 deletions

View File

@@ -22,7 +22,7 @@
"source": "https://github.com/getkirby/starterkit" "source": "https://github.com/getkirby/starterkit"
}, },
"require": { "require": {
"php": ">=7.4.0 <8.1.0", "php": ">=7.4.0 <8.2.0",
"getkirby/cms": "^3.6" "getkirby/cms": "^3.6"
}, },
"scripts": { "scripts": {

View File

@@ -29,7 +29,7 @@ columns:
label: Alternative Text label: Alternative Text
type: text type: text
photographer: photographer:
label: Photogapher label: Photographer
type: text type: text
width: 2/3 width: 2/3
license: license:

View File

@@ -4,7 +4,7 @@
* if you need to reuse the same set up pages, files or users in multiple places across your site. * if you need to reuse the same set up pages, files or users in multiple places across your site.
* *
* More about collections: * More about collections:
* http://getkirby.test/docs/guide/templates/collections * https://getkirby.com/docs/guide/templates/collections
*/ */
return function () { return function () {
return page('notes') return page('notes')

View File

@@ -11,12 +11,12 @@
*/ */
return function ($page) { return function ($page) {
$tag = urldecode(param('tag')); $tag = urldecode(param('tag') ?? '');
/** /**
* We use the collection helper to fetch the notes collection defined in `/site/collections/notes.php` * We use the collection helper to fetch the notes collection defined in `/site/collections/notes.php`
* *
* More about collections: * More about collections:
* http://getkirby.test/docs/guide/templates/collections * https://getkirby.com/docs/guide/templates/collections
*/ */
$notes = collection('notes'); $notes = collection('notes');

View File

@@ -28,17 +28,17 @@
<h2 class="h1">Get in contact</h2> <h2 class="h1">Get in contact</h2>
<div class="grid" style="--gutter: 1.5rem"> <div class="grid" style="--gutter: 1.5rem">
<section class="column text" style="--columns: 4"> <section class="column text" style="--columns: 4">
<h3>Address</h2> <h3>Address</h3>
<?= $page->address()->kt() ?> <?= $page->address()->kt() ?>
</section> </section>
<section class="column text" style="--columns: 4"> <section class="column text" style="--columns: 4">
<h3>Email</h2> <h3>Email</h3>
<p><?= html::email($page->email()) ?></p> <p><?= html::email($page->email()) ?></p>
<h3>Phone</h2> <h3>Phone</h3>
<p><?= html::tel($page->phone()) ?></p> <p><?= html::tel($page->phone()) ?></p>
</section> </section>
<section class="column text" style="--columns: 4"> <section class="column text" style="--columns: 4">
<h3>On the web</h2> <h3>On the web</h3>
<ul> <ul>
<?php foreach ($page->social()->toStructure() as $social): ?> <?php foreach ($page->social()->toStructure() as $social): ?>
<li><?= html::a($social->url(), $social->platform()) ?></li> <li><?= html::a($social->url(), $social->platform()) ?></li>
@@ -48,6 +48,4 @@
</div> </div>
</aside> </aside>
</div>
<?php snippet('footer') ?> <?php snippet('footer') ?>