diff --git a/assets/css/src/article.css b/assets/css/src/article.css index b018441..191b259 100644 --- a/assets/css/src/article.css +++ b/assets/css/src/article.css @@ -36,14 +36,6 @@ article h3 { margin-bottom: calc(1 * var(--unit--vertical)); } -article li, article ol{ - margin-left: var(--unit--horizontal); -} - -article figure img{ - max-width: 100%; -} - @media screen and (min-width: 640px) { article #main-content { max-width: auto; diff --git a/assets/css/src/reset.css b/assets/css/src/reset.css index 1a80502..65558c2 100644 --- a/assets/css/src/reset.css +++ b/assets/css/src/reset.css @@ -6,8 +6,7 @@ h3, h4, h5, p, -ul, -figure { +ul { margin: 0; padding: 0; } diff --git a/assets/css/src/texts.css b/assets/css/src/texts.css index ba9dd6c..6bdb636 100644 --- a/assets/css/src/texts.css +++ b/assets/css/src/texts.css @@ -28,8 +28,7 @@ h4 *, h5, h5 *, p, -p *:not(strong), -figcaption { +p *:not(strong) { font-weight: var(--font-weight-light); line-height: 1; } @@ -169,7 +168,7 @@ a:not(.no-underline) { text-decoration-thickness: 0.5px; } -article p:not(:last-child), article ul:not(:last-child), article figure:not(:last-child){ +article p:not(:last-child) { margin-bottom: var(--unit--vertical); } diff --git a/site/blueprints/fields/bodyBlocks.yml b/site/blueprints/fields/bodyBlocks.yml index 3956984..de04c35 100644 --- a/site/blueprints/fields/bodyBlocks.yml +++ b/site/blueprints/fields/bodyBlocks.yml @@ -33,4 +33,4 @@ text: extends: fields/body label: false - image: true \ No newline at end of file + image: true diff --git a/site/blueprints/pages/linear.yml b/site/blueprints/pages/linear.yml index d295656..0fb2d5f 100644 --- a/site/blueprints/pages/linear.yml +++ b/site/blueprints/pages/linear.yml @@ -42,7 +42,7 @@ tabs: isArchiveMode: false body: extends: fields/body - help: Anciens champs conservés pour archive (ne pas remplir pour les nouveaux articles). Ce champs ne sera utiliser en front que si le champs "corp" normal est vide. + help: Anciens champs conservés pour archive (ne pas remplir pour les nouveaux articles) width: 3/4 when: isHtmlMode: false diff --git a/site/snippets/blocks/image.php b/site/snippets/blocks/image.php deleted file mode 100644 index 2099224..0000000 --- a/site/snippets/blocks/image.php +++ /dev/null @@ -1,37 +0,0 @@ -alt(); -$caption = $block->caption(); -$crop = $block->crop()->isTrue(); -$link = $block->link(); -$ratio = $block->ratio()->or('auto'); -$src = null; -$srcset = null; - -if ($block->location() == 'web') { - $src = $block->src()->esc(); -} elseif ($image = $block->image()->toFile()) { - $alt = $alt->or($image->alt()); - $src = $image->url(); - $srcset = $image->srcset([300, 600, 900, 1200, 1800]); -} - -?> - - $ratio, 'data-crop' => $crop], null, ' ') ?>> - isNotEmpty()): ?> - - <?= $alt->esc() ?> srcset="" sizes="min(60vw, 45rem)" loading="lazy"> - - - <?= $alt->esc() ?> srcset="" sizes="min(60vw, 45rem)" loading="lazy"> - - - isNotEmpty()): ?> -
- -
- - - \ No newline at end of file diff --git a/site/templates/linear.php b/site/templates/linear.php index 9177510..f8e6e50 100644 --- a/site/templates/linear.php +++ b/site/templates/linear.php @@ -32,8 +32,6 @@ isHtmlMode()->isTrue()): ?> htmlBody()->kt() ?> - bodyBlocks()->isNotEmpty()): ?> - bodyBlocks()->toBlocks() ?> body() ?>