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

2021-04-27 10:41:48 +02:00
parent 7477aec06c 8fd9619415
commit de3560f3d6
36 changed files with 2 additions and 2 deletions
--- a/assets/css/lightbox.css
+++ b/assets/css/lightbox.css
--- a/assets/css/templates/note.css
+++ b/assets/css/templates/note.css
--- a/assets/js/index.js
+++ b/assets/js/index.js
--- a/assets/js/lightbox.js
+++ b/assets/js/lightbox.js
--- a/content/1_photography/photography.txt
+++ b/content/1_photography/photography.txt
--- a/content/2_notes/notes.txt
+++ b/content/2_notes/notes.txt
--- a/content/error/error.txt
+++ b/content/error/error.txt
--- a/content/home/home.txt
+++ b/content/home/home.txt
--- a/content/site.txt
+++ b/content/site.txt
--- a/site/blueprints/fields/cover.yml
+++ b/site/blueprints/fields/cover.yml
@@ -1,9 +1,9 @@
 # Fields can be defined in there own field blueprints
 # and reused across multiple blueprints
 # This field is used in the album.yml and note.yml blueprints
-# See http://getkirby.test/docs/guide/blueprints/extending-blueprints#reusing-and-extending-single-fields
+# See http://getkirby.com/docs/guide/blueprints/extending-blueprints#reusing-and-extending-single-fields
 type: files
 multiple: false
 query: page.images.template('image')
 uploads:
-  template: image
+  template: image
--- a/site/blueprints/pages/note.yml
+++ b/site/blueprints/pages/note.yml
--- a/site/collections/notes.php
+++ b/site/collections/notes.php
--- a/site/config/config.php
+++ b/site/config/config.php
--- a/site/controllers/album.php
+++ b/site/controllers/album.php
--- a/site/controllers/note.php
+++ b/site/controllers/note.php
--- a/site/controllers/notes.php
+++ b/site/controllers/notes.php
--- a/site/models/album.php
+++ b/site/models/album.php
--- a/site/models/note.php
+++ b/site/models/note.php
--- a/site/snippets/blocks/image.php
+++ b/site/snippets/blocks/image.php
--- a/site/snippets/blocks/video.php
+++ b/site/snippets/blocks/video.php
--- a/site/snippets/footer.php
+++ b/site/snippets/footer.php
--- a/site/snippets/gallery.php
+++ b/site/snippets/gallery.php
--- a/site/snippets/header.php
+++ b/site/snippets/header.php
--- a/site/snippets/intro.php
+++ b/site/snippets/intro.php
--- a/site/snippets/layouts.php
+++ b/site/snippets/layouts.php
--- a/site/snippets/note.php
+++ b/site/snippets/note.php
--- a/site/snippets/pagination.php
+++ b/site/snippets/pagination.php
--- a/site/snippets/prevnext.php
+++ b/site/snippets/prevnext.php
--- a/site/snippets/social.php
+++ b/site/snippets/social.php
--- a/site/templates/about.php
+++ b/site/templates/about.php
--- a/site/templates/album.php
+++ b/site/templates/album.php
--- a/site/templates/default.php
+++ b/site/templates/default.php
--- a/site/templates/home.php
+++ b/site/templates/home.php
--- a/site/templates/note.php
+++ b/site/templates/note.php
--- a/site/templates/notes.php
+++ b/site/templates/notes.php
--- a/site/templates/photography.php
+++ b/site/templates/photography.php