Skip to content

Commit

Permalink
feat: updated styles and content structure
Browse files Browse the repository at this point in the history
  • Loading branch information
jeslage committed Apr 13, 2023
1 parent f0c6c87 commit eee6b04
Show file tree
Hide file tree
Showing 47 changed files with 415 additions and 212 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
"postcss": "latest",
"postcss-plugin": "^1.0.0",
"postcss-pxtorem": "^6.0.0",
"sass": "^1.62.0",
"tailwindcss": "^3.3.0",
"typescript": "^4.9.3",
"vite": "^4.2.0",
"vite-plugin-kirby": "^0.1.4",
"vite-plugin-kirby": "0.2.0",
"vite-plugin-live-reload": "^3.0.2"
},
"packageManager": "yarn@3.5.0",
Expand Down
1 change: 1 addition & 0 deletions public/assets/dist/assets/main-77fd9dd5.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/assets/dist/assets/main-f3ee5932.css

This file was deleted.

6 changes: 3 additions & 3 deletions public/assets/dist/manifest.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"main.css": {
"file": "assets/main-f3ee5932.css",
"file": "assets/main-77fd9dd5.css",
"src": "main.css"
},
"main.ts": {
"css": [
"assets/main-f3ee5932.css"
"assets/main-77fd9dd5.css"
],
"file": "assets/main-68a19774.js",
"file": "assets/main-b24b3c1d.js",
"isEntry": true,
"src": "main.ts"
}
Expand Down
1 change: 0 additions & 1 deletion public/assets/icons/facebook.svg

This file was deleted.

6 changes: 5 additions & 1 deletion public/assets/icons/instagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion public/assets/icons/linkedin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion public/assets/icons/tiktok.svg

This file was deleted.

6 changes: 5 additions & 1 deletion public/assets/icons/twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/icons/youtube.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion public/assets/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 0 additions & 25 deletions site/blueprints/blocks/image.yml

This file was deleted.

9 changes: 9 additions & 0 deletions site/blueprints/blocks/images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
name: Images
icon: image
preview: fields
fields:
images:
extends: fields/image
label: Images
multiple: true
max: 2
2 changes: 1 addition & 1 deletion site/blueprints/fields/blocks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ fieldsets:
accordion: blocks/accordion
contact: blocks/contact
gallery: blocks/gallery
image: blocks/image
images: blocks/images
imageText: blocks/image-text
richtext: blocks/richtext
table: blocks/table
1 change: 0 additions & 1 deletion site/blueprints/pages/articles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ title: Articles
icon: grid

options:
preview: false
create: false
delete: false
duplicate: false
Expand Down
9 changes: 3 additions & 6 deletions site/blueprints/sections/content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,8 @@ columns:
cover:
extends: fields/image
required: false
subline:
label: Subline
type: text
maxlength: 80
intro:
label: Intro
excerpt:
label: Excerpt
help: The excerpt is used in the teaser
type: text
maxlength: 200
16 changes: 13 additions & 3 deletions site/blueprints/sections/globals.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,29 @@ fields:
label: Footer Navigation
type: navigation
levels: 1
width: 1/2
metaNavigation:
label: Meta Navigation
type: navigation
levels: 1
width: 1/2
footerText:
extends: fields/writer/default
label: Text
width: 1/2
socialMedia:
label: Social Media
type: structure
width: 1/2
fields:
service:
type: select
default: facebook
default: instagram
required: true
options:
facebook: Facebook
instagram: Instagram
linkedin: LinkedIn
tiktok: TikTok
youtube: YouTube
twitter: Twitter
url:
label: URL
Expand Down
Binary file modified site/logs/retour/log.sqlite
Binary file not shown.
8 changes: 4 additions & 4 deletions site/snippets/blocks.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php foreach ($page->blocks()->toBlocks() as $block): ?>
<div id="<?= $block->id() ?>" class="block block-type-<?= $block->type() ?>">
<?php snippet('blocks/' . $block->type(), [
'block' => $block
]) ?>

<div id="<?= $block->id() ?>" class="block block--<?= $block->type() ?>">
<?php snippet('blocks/' . $block->type(), ['block' => $block]) ?>
</div>

<?php endforeach ?>
2 changes: 0 additions & 2 deletions site/snippets/blocks/code.php

This file was deleted.

7 changes: 6 additions & 1 deletion site/snippets/blocks/gallery.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
<?php
/** @var \Kirby\Cms\Block $block */

use Kirby\Cms\Html;

$caption = $block->caption();
$crop = $block->crop()->isTrue();
$ratio = $block->ratio()->or('auto');

$attr = Html::attr(['data-ratio' => $ratio, 'data-crop' => $crop]);
?>
<figure<?= Html::attr(['data-ratio' => $ratio, 'data-crop' => $crop], null, ' ') ?>>
<figure<?= $attr ?>>
<ul>
<?php foreach ($block->images()->toFiles() as $image): ?>
<li>
Expand Down
2 changes: 0 additions & 2 deletions site/snippets/blocks/heading.php

This file was deleted.

Loading

0 comments on commit eee6b04

Please sign in to comment.