From 9ef96b6897f1aa1fab631573652c87e05608b5de Mon Sep 17 00:00:00 2001 From: Julie Blanc Date: Tue, 21 Apr 2026 16:37:59 +0200 Subject: [PATCH] wrap thesis --- css/modules/_text.scss | 51 +++++++++++++++-------------- css/modules/_titles.scss | 35 ++++++++------------ css/style.css | 39 ++++++++-------------- css/style.css.map | 2 +- js/beforeAll.js | 71 ++++++++++++++++++++++++++-------------- 5 files changed, 101 insertions(+), 97 deletions(-) diff --git a/css/modules/_text.scss b/css/modules/_text.scss index 8f918a6..1d92b22 100644 --- a/css/modules/_text.scss +++ b/css/modules/_text.scss @@ -70,49 +70,52 @@ ul{ + +// ol, p, h4, h5, h6{ +// display: none; +// } + + // THESE -------------------------------------------------- -.p-these{ - font-weight: 500; - margin-bottom: calc(var(--baseline)*0.5); - strong{ - text-transform: uppercase; - display: inline-block; - min-width: $indent*2; - font-weight: bold; - font-size: var(--fs-small); - letter-spacing: 0.05rem; - } +.thesis p{ + display: block; } +// .p-these{ +// font-weight: 500; +// margin-bottom: calc(var(--baseline)*0.5); +// display: block; +// strong{ +// text-transform: uppercase; +// display: inline-block; +// min-width: $indent*2; +// font-weight: bold; +// font-size: var(--fs-small); +// letter-spacing: 0.05rem; +// } -.p-these-last{ - margin-bottom: calc(var(--baseline)*1); -} + +// } + +// .p-these-last{ +// margin-bottom: calc(var(--baseline)*1); +// } // INTRO -------------------------------------------------- - - .has-intro-1-paragraph .intro, .has-intro .intro{ break-after: right; } .intro{ - color: red; p{ font-size: var(--fs-intro); padding-left: calc(var(--unit)*1); line-height: 1.4; + display: block; } } - - -.chapter-end{ - width: 20px; - height: 20px; - background-color: green; -} \ No newline at end of file diff --git a/css/modules/_titles.scss b/css/modules/_titles.scss index b3b7dde..6583d95 100644 --- a/css/modules/_titles.scss +++ b/css/modules/_titles.scss @@ -2,35 +2,26 @@ #section__content{ - - - - - h1:first-of-type{ - // column-span: all; - // height: $content-h; - } - - // .before-h1{ - // break-after: page; - // } + h1{ + .h1-count::after{ + content: "." + } + .h1-count{ + margin-bottom: 1em; + } - // break-before: page; - // break-after: page; - - // position: absolute; - // left: 0; - // top: 0; - - height: $content-h; - // background-color: red; + min-height: $content-h; display: flex; flex-direction: column; justify-content: space-between; - // display: none; + + &[data-split-from]{ + color: red; + position: absolute; + } } diff --git a/css/style.css b/css/style.css index 069a1a7..5a2d879 100644 --- a/css/style.css +++ b/css/style.css @@ -304,21 +304,8 @@ ul { color: red; } -.p-these { - font-weight: 500; - margin-bottom: calc(var(--baseline) * 0.5); -} -.p-these strong { - text-transform: uppercase; - display: inline-block; - min-width: 20mm; - font-weight: bold; - font-size: var(--fs-small); - letter-spacing: 0.05rem; -} - -.p-these-last { - margin-bottom: calc(var(--baseline) * 1); +.thesis p { + display: block; } .has-intro-1-paragraph .intro, @@ -327,19 +314,11 @@ ul { break-after: right; } -.intro { - color: red; -} .intro p { font-size: var(--fs-intro); padding-left: calc(var(--unit) * 1); line-height: 1.4; -} - -.chapter-end { - width: 20px; - height: 20px; - background-color: green; + display: block; } [data-id=section__content] { @@ -361,12 +340,22 @@ ol[type="1"] { left: 0px; } +#section__content h1 .h1-count::after { + content: "."; +} +#section__content h1 .h1-count { + margin-bottom: 1em; +} #section__content h1 { - height: 215mm; + min-height: 215mm; display: flex; flex-direction: column; justify-content: space-between; } +#section__content h1[data-split-from] { + color: red; + position: absolute; +} #section__content h2::before, #section__content h3::before, #section__content h4::before, #section__content h5::before, #section__content h6::before { content: attr(data-counter); } diff --git a/css/style.css.map b/css/style.css.map index 05d0596..5994bf6 100644 --- a/css/style.css.map +++ b/css/style.css.map @@ -1 +1 @@ -{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file +{"version":3,"sources":["style.css","modules/_var.scss","modules/_init.scss","modules/_layout.scss","modules/_text.scss","modules/_num-paragraph.scss","modules/_titles.scss","modules/_list-of-abbr.scss","modules/_notes.scss","modules/_toc.scss"],"names":[],"mappings":"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","file":"style.css"} \ No newline at end of file diff --git a/js/beforeAll.js b/js/beforeAll.js index 62fc2ca..bc17ec5 100644 --- a/js/beforeAll.js +++ b/js/beforeAll.js @@ -58,10 +58,10 @@ function wrapChapterAndIntro(content){ - // Wrap content between h1 and h2 in .intro if chapter doesn't contain .p-these + // Wrap content between h1 and h2 in .intro if chapter doesn't contain .thesis const chapters = sectionContent.querySelectorAll('.chapter'); chapters.forEach(chapter => { - if (chapter.querySelector('.p-these')) { + if (chapter.querySelector('.thesis')) { // Case 1: Chapter has thesis chapter.classList.add('has-thesis'); } else { @@ -150,31 +150,52 @@ function wrapChapterAndIntro(content){ function thesis(content){ const strongs = content.querySelectorAll('strong'); - strongs.forEach(strong => { - if (/^these\s+\d+/i.test(strong.textContent.trim())) { - const parent = strong.closest('p'); - if (parent) { - const thesisDiv = document.createElement('div'); - thesisDiv.classList.add('thesis-title'); - const thesisP = document.createElement('p'); - thesisP.textContent = strong.textContent; - thesisDiv.appendChild(thesisP); - parent.parentNode.insertBefore(thesisDiv, parent); - strong.remove(); + const thesisElements = []; - parent.classList.add('p-these'); + strongs.forEach(strong => { + if (/^these\s+\d+/i.test(strong.textContent.trim())) { + const parent = strong.closest('p'); + if (parent) { + // Create thesis wrapper + const thesisWrapper = document.createElement('div'); + thesisWrapper.classList.add('thesis'); + + // Find preceding ol if it exists + let prev = parent.previousElementSibling; + let olElement = null; + if (prev && prev.tagName.toLowerCase() === 'ol') { + olElement = prev; } - } - }); - const theseParas = content.querySelectorAll('.p-these'); - theseParas.forEach(p => { - let next = p.nextElementSibling; - while (next && next.tagName.toLowerCase() === 'ol') { - next = next.nextElementSibling; + // Insert thesis wrapper before ol or before p + if (olElement) { + olElement.parentNode.insertBefore(thesisWrapper, olElement); + thesisWrapper.appendChild(olElement); + } else { + parent.parentNode.insertBefore(thesisWrapper, parent); + } + + // Create thesis-title + const thesisTitleDiv = document.createElement('div'); + thesisTitleDiv.classList.add('thesis-title'); + const thesisP = document.createElement('p'); + thesisP.textContent = strong.textContent; + thesisTitleDiv.appendChild(thesisP); + thesisWrapper.appendChild(thesisTitleDiv); + + // Transform parent p into thesis-content + strong.remove(); + parent.classList.add('thesis-content'); + thesisWrapper.appendChild(parent); + + thesisElements.push(thesisWrapper); } - if (!next || !next.classList.contains('p-these')) { - p.classList.add('p-these-last'); - } - }); + } + }); + + // Mark first and last thesis + if (thesisElements.length > 0) { + thesisElements[0].classList.add('thesis-first'); + thesisElements[thesisElements.length - 1].classList.add('thesis-last'); + } } \ No newline at end of file