From a9d24a43a9cc8a9a9c4b222767c245bc97a7230d Mon Sep 17 00:00:00 2001
From: antonin gallon
Date: Thu, 4 Dec 2025 12:11:46 +0100
Subject: [PATCH 1/2] revision interlignage print + marge dans linear
---
assets/css/src/grid.css | 14 --------------
assets/css/src/print.css | 24 ++++++++++++++++++++++++
2 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/assets/css/src/grid.css b/assets/css/src/grid.css
index 511370c..b9cc259 100644
--- a/assets/css/src/grid.css
+++ b/assets/css/src/grid.css
@@ -46,18 +46,4 @@ body.full-width #main-content {
column-gap: var(--unit--horizontal);
margin-bottom: calc(var(--unit--vertical) * 2);
}
-}
-
-@media print{
- .grid .column {
- grid-column: span 1;
- }
- [data-template="grid"] .grid {
- column-gap: 20px;
- grid-template-columns: repeat(2, 1fr);
- }
-
- .blocks, .column {
- page-break-inside: auto; /* autoriser la coupe si nécessaire */
- }
}
\ No newline at end of file
diff --git a/assets/css/src/print.css b/assets/css/src/print.css
index 82f0271..41c663a 100644
--- a/assets/css/src/print.css
+++ b/assets/css/src/print.css
@@ -1,11 +1,35 @@
@media print {
/* Hide header / footer infos. */
+ :root{
+ --font-size-m: calc(var(--font-size-s) * 1.4) !important;
+ }
+ *:not(.page-cover) p, *:not(.page-cover) li, *:not(.page-cover) button, *:not(.page-cover) .fs-m{
+ font-size: var(--font-size-m);
+ line-height: 1.2;
+ }
+
* {
-webkit-print-color-adjust: exact;
print-color-adjust: exact;
}
+ [data-template="linear"] #main-content{
+ padding-right: calc(var(--unit--horizontal) * 2) ;
+
+ }
+
+ [data-template="grid"] .grid .column {
+ grid-column: span 1;
+ }
+ [data-template="grid"] .grid {
+ column-gap: 20px;
+ grid-template-columns: repeat(2, 1fr);
+ }
+ [data-template="grid"] .blocks, .column {
+ page-break-inside: auto; /* autoriser la coupe si nécessaire */
+ }
+
@page {
/*variable pas supporter dans les marges...*/
/*
From 8c8295b677d043113a5dd364ae2e5b236bce4647 Mon Sep 17 00:00:00 2001
From: antonin gallon
Date: Thu, 4 Dec 2025 15:15:40 +0100
Subject: [PATCH 2/2] =?UTF-8?q?ajout=20du=20bouton=20et=20du=20champs=20da?=
=?UTF-8?q?ns=20le=20panel=20pour=20t=C3=A9l=C3=A9charger=20le=20pdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/src/print.css | 2 +-
site/blueprints/files/pdfVersion-file.yml | 2 ++
site/blueprints/pages/grid.yml | 8 ++++++++
site/blueprints/pages/linear.yml | 8 ++++++++
site/templates/grid.php | 7 +++++++
site/templates/linear.php | 7 +++++++
6 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 site/blueprints/files/pdfVersion-file.yml
diff --git a/assets/css/src/print.css b/assets/css/src/print.css
index 41c663a..eeea972 100644
--- a/assets/css/src/print.css
+++ b/assets/css/src/print.css
@@ -64,7 +64,7 @@
}
.panel, nav, .main-edito-btn, .theme-toggler, .page-cover .links,
- [data-template="home"] .title-wrapper button.open-nav, #nav-overlay{
+ [data-template="home"] .title-wrapper button.open-nav, #nav-overlay, .only-screen{
display: none !important;
}
diff --git a/site/blueprints/files/pdfVersion-file.yml b/site/blueprints/files/pdfVersion-file.yml
new file mode 100644
index 0000000..92de0e0
--- /dev/null
+++ b/site/blueprints/files/pdfVersion-file.yml
@@ -0,0 +1,2 @@
+accept:
+ extension: pdf
\ No newline at end of file
diff --git a/site/blueprints/pages/grid.yml b/site/blueprints/pages/grid.yml
index 414460c..b9cb32e 100644
--- a/site/blueprints/pages/grid.yml
+++ b/site/blueprints/pages/grid.yml
@@ -15,6 +15,14 @@ tabs:
label: Corps
type: fields
fields:
+ pdfVersion:
+ label: version pdf
+ help: glisser ici le fichier pdf généré avec `ctrl + p` depuis la page du site
+ type: files
+ multiple: false
+ image: false
+ uploads: pdfVersion-file
+ width: 1/3
fullWidth:
label: Pleine largeur
type: toggle
diff --git a/site/blueprints/pages/linear.yml b/site/blueprints/pages/linear.yml
index e6cf2e5..d11ed0f 100644
--- a/site/blueprints/pages/linear.yml
+++ b/site/blueprints/pages/linear.yml
@@ -15,6 +15,14 @@ tabs:
label: Corps
type: fields
fields:
+ pdfVersion:
+ label: version pdf
+ help: glisser ici le fichier pdf généré avec `ctrl + p` depuis la page du site
+ type: files
+ multiple: false
+ image: false
+ uploads: pdfVersion-file
+ width: 1/3
subtitle:
label: Sous-titre
type: writer
diff --git a/site/templates/grid.php b/site/templates/grid.php
index efd8f5e..62c3ff1 100644
--- a/site/templates/grid.php
+++ b/site/templates/grid.php
@@ -15,6 +15,13 @@
/ = $page->category() ?>
+ pdfVersion()->toFile()): ?>
+
+
+ télécharger le pdf
+
+
+
imprimé le = \Kirby\Toolkit\Date::today()->format('d/m/Y'); ?>
= $page->url() ?>
diff --git a/site/templates/linear.php b/site/templates/linear.php
index cd94c5e..a7c9cb1 100644
--- a/site/templates/linear.php
+++ b/site/templates/linear.php
@@ -20,6 +20,13 @@
/ = $page->category() ?>
+ pdfVersion()->toFile()): ?>
+
+
+ télécharger le pdf
+
+
+
imprimé le = \Kirby\Toolkit\Date::today()->format('d/m/Y'); ?>
= $page->url() ?>