Valentin 1 год назад
Родитель
Сommit
ec262aa48e

+ 1 - 1
user/data/feed/3a6d0284e743dc4a9b86f97d6dd1a3bf.yaml

@@ -1,4 +1,4 @@
-last_checked: 1690334822
+last_checked: 1690412093
 data:
   -
     title: 'macOS 13.0 Ventura Apache Setup: Upgrading Homebrew'

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
user/data/flex/indexes/pages.json


+ 1 - 1
user/data/notifications/3a6d0284e743dc4a9b86f97d6dd1a3bf.yaml

@@ -1,4 +1,4 @@
-last_checked: 1690337801
+last_checked: 1690412089
 data:
   feed:
     -

BIN
user/themes/carnet-atterrissage/assets/bruit_couv.png


+ 48 - 2
user/themes/carnet-atterrissage/css/mep_carnet.css

@@ -63,7 +63,7 @@
 }
 
 .pagedjs_first_page {
-  background: linear-gradient(to left, 
+  background-image: url(../assets/bruit_couv.png), linear-gradient(to left, 
   #5595a1 0%, 
   #5f9796 14%, 
   #65998d 28%, 
@@ -73,8 +73,47 @@
   #8ba460 85%);
 }
 
+.pagedjs_first_page img[alt="img_couv"] {
+  position: absolute;
+  width: 80mm;
+  left: 34.5mm;
+  top: 10mm;
+}
+
+.pagedjs_first_page img[alt="logo_rivage"] {
+  position: absolute;
+  width: 30mm;
+  bottom: 0;
+  left: 59.5mm;
+}
+
+.pagedjs_first_page h2 {
+  position: absolute;
+  font-size: 36pt;
+  font-weight: bold;
+  left: -8mm;
+  width: 165mm;
+  top: 73mm;
+  line-height: 1.1 !important;
+}
+
+.pagedjs_first_page .free {
+  margin: 0;
+  text-align: center;
+  font-family: 'Ortica';
+  font-weight: bold;
+  color: white;
+  font-size: 10pt;
+  line-height: 1.3;
+  position: absolute;
+  padding: 0;
+  margin-left: -8mm;
+  width: 165mm;
+  top: 110mm;
+}
+
 .last-page {
-  background: linear-gradient(to left, 
+  background-image: url(../assets/bruit_couv.png), linear-gradient(to left, 
   #95a358 0%, 
   #9ca151 14%, 
   #a59d4a 28%, 
@@ -97,6 +136,7 @@
   padding-bottom: 20mm;
   font-size: 11pt;
   color: white;
+  line-height: 1.5;
 }
 
 body {
@@ -139,6 +179,12 @@ h2 {
   background-color: #4a90b2;
 }
 
+.partie_cover_page .pagedjs_page_content > div {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 .partie_count {
   font-size: 55pt;
   color: white;

+ 26 - 6
user/themes/carnet-atterrissage/js/layout.js

@@ -245,8 +245,6 @@ class setMarginTexts extends Paged.Handler {
                 partieCount.innerHTML = 'Partie<br>' + romanCount;
                 h2s[i].parentElement.prepend(partieCount);
                 h2s[i].nextElementSibling?.remove();
-                h2s[i].parentElement.parentElement.parentElement.parentElement.style.display = 'flex';
-                h2s[i].parentElement.parentElement.parentElement.parentElement.style.alignItems = 'center';
             }
         }
 
@@ -254,18 +252,30 @@ class setMarginTexts extends Paged.Handler {
         let topLeftBoxes = document.querySelectorAll('.pagedjs_margin-left-top');
         for (let topLeftBox of topLeftBoxes) {
             let contentDiv = topLeftBox.firstElementChild;
-            let textToPut;
+            let textToPut = document.createElement('p');
+            let atelierGras;
             let currentPage = contentDiv.closest('.pagedjs_page');
             if (currentPage.id != "page-1") {
                 let previousPage = currentPage.previousElementSibling;
                 while (previousPage) {
                     if (previousPage.firstElementChild.classList.contains('atelier_cover_page')) {
-                        textToPut = previousPage.querySelector('h3').innerText;
+                        textToPut.innerText = previousPage.querySelector('h3').innerText;
+                        let words = textToPut.innerText.split(' ');
+                        let num = parseInt(words[0], 10);
+                        if (!isNaN(num)) {
+                            atelierGras = document.createElement('span');
+                            atelierGras.style.fontWeight = "bold";
+                            atelierGras.innerText = `Atelier ${num} `;
+                            textToPut.innerText = textToPut.innerText.substring(1);
+                        }
                         break;
                     }
                     previousPage = previousPage.previousElementSibling;
                 }
             }
+            if (atelierGras) {
+                textToPut.prepend(atelierGras);
+            }
             contentDiv.append(textToPut);
             contentDiv.style.marginTop = contentDiv.offsetWidth / 2 - contentDiv.offsetHeight / 2 + "px";
         }
@@ -273,18 +283,28 @@ class setMarginTexts extends Paged.Handler {
         let bottomLeftBoxes = document.querySelectorAll('.pagedjs_margin-left-bottom');
         for (let bottomLeftBox of bottomLeftBoxes) {
             let contentDiv = bottomLeftBox.firstElementChild;
-            let textToPut;
+            let textToPut = document.createElement('p');
+            let partieGras;
             let currentPage = contentDiv.closest('.pagedjs_page');
             if (currentPage.id != "page-1") {
                 let previousPage = currentPage.previousElementSibling;
                 while (previousPage) {
                     if (previousPage.firstElementChild.classList.contains('partie_cover_page')) {
-                        textToPut = previousPage.querySelector('h2').innerText;
+                        textToPut.innerText = previousPage.querySelector('h2').innerText;
+                        partieGras = document.createElement('span');
+                        partieGras.style.fontWeight = "bold";
+                        partieGras.innerText = previousPage.querySelector('.partie_count').innerHTML.replace("<br>", " ") + " ";
                         break;
                     }
                     previousPage = previousPage.previousElementSibling;
                 }
             }
+            if (!textToPut.innerText) {
+                textToPut.innerText = "Introduction";
+            }
+            if (partieGras) {
+                textToPut.prepend(partieGras);
+            }
             contentDiv.append(textToPut);
             contentDiv.style.marginBottom = contentDiv.offsetWidth / 2 - contentDiv.offsetHeight / 2 + "px";
         }

Некоторые файлы не были показаны из-за большого количества измененных файлов