diff --git a/assets/css/src/article.css b/assets/css/src/article.css index 191b259..b018441 100644 --- a/assets/css/src/article.css +++ b/assets/css/src/article.css @@ -36,6 +36,14 @@ 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 65558c2..1a80502 100644 --- a/assets/css/src/reset.css +++ b/assets/css/src/reset.css @@ -6,7 +6,8 @@ h3, h4, h5, p, -ul { +ul, +figure { margin: 0; padding: 0; } diff --git a/assets/css/src/texts.css b/assets/css/src/texts.css index 6bdb636..ba9dd6c 100644 --- a/assets/css/src/texts.css +++ b/assets/css/src/texts.css @@ -28,7 +28,8 @@ h4 *, h5, h5 *, p, -p *:not(strong) { +p *:not(strong), +figcaption { font-weight: var(--font-weight-light); line-height: 1; } @@ -168,7 +169,7 @@ a:not(.no-underline) { text-decoration-thickness: 0.5px; } -article p:not(:last-child) { +article p:not(:last-child), article ul:not(:last-child), article figure:not(:last-child){ margin-bottom: var(--unit--vertical); } diff --git a/site/blueprints/fields/bodyBlocks.yml b/site/blueprints/fields/bodyBlocks.yml index de04c35..3956984 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 + image: true \ No newline at end of file diff --git a/site/blueprints/pages/linear.yml b/site/blueprints/pages/linear.yml index 0fb2d5f..d295656 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) + 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. width: 3/4 when: isHtmlMode: false diff --git a/site/templates/linear.php b/site/templates/linear.php index f8e6e50..9177510 100644 --- a/site/templates/linear.php +++ b/site/templates/linear.php @@ -32,6 +32,8 @@ isHtmlMode()->isTrue()): ?> htmlBody()->kt() ?> + bodyBlocks()->isNotEmpty()): ?> + bodyBlocks()->toBlocks() ?> body() ?>