From b03df02e27292bfbe13e2efb4becb721684a4719 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Mon, 10 Jul 2023 16:50:06 +0300 Subject: (presentation) Reworked controller to use the characters --- awk-edits/Presentation.awk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'awk-edits/Presentation.awk') diff --git a/awk-edits/Presentation.awk b/awk-edits/Presentation.awk index d20763b..f3fce0e 100644 --- a/awk-edits/Presentation.awk +++ b/awk-edits/Presentation.awk @@ -156,12 +156,12 @@ BEGIN { pres = ORS \ "

" ORS \ " " -- cgit v1.3.1-26-gb76a From fc912ee942e9e577156fcedee047fee66d0eed13 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Tue, 11 Jul 2023 09:36:32 +0300 Subject: (presentation) Fixed slide scaling to work properly --- awk-edits/Presentation.awk | 2 +- src/presentation.css | 9 +++++---- src/scripts/presentation.js | 10 ++++++++-- src/styles.css | 3 ++- 4 files changed, 16 insertions(+), 8 deletions(-) (limited to 'awk-edits/Presentation.awk') diff --git a/awk-edits/Presentation.awk b/awk-edits/Presentation.awk index f3fce0e..d1233c6 100644 --- a/awk-edits/Presentation.awk +++ b/awk-edits/Presentation.awk @@ -163,7 +163,7 @@ BEGIN { " \\⎚" ORS \ " \\⎙" ORS \ "

" ORS \ -" " +" " for (i = 1; i <= nameslength; i++) { pat[i] = "&&" names[i] diff --git a/src/presentation.css b/src/presentation.css index 4b74030..4dbe7e0 100644 --- a/src/presentation.css +++ b/src/presentation.css @@ -6,6 +6,8 @@ padding: 1em; width: 297mm; /* Size of landscape A4 paper */ font-size: 30px; + transform-origin: 0 0; + margin-bottom: 1em; } .absolute-slide { border: none !important; @@ -15,6 +17,7 @@ right: 0; top: 50%; transform: translate(-50%, -50%); + transform-origin: center center; visibility: visible; } .absolute-slide .clicked-image { @@ -25,8 +28,6 @@ /* Stylesheet override */ -article { max-width: calc(297mm + 2em); } - ul, ol { padding-inline-start: 30px; } /* Presentation controller */ @@ -127,7 +128,6 @@ absolute-slide {...} */ @media screen { .slide { border: 1px solid var(--fg-color); - margin-bottom: 1em; } } @@ -135,7 +135,7 @@ absolute-slide {...} */ article, body { border: none !important; margin: 0; - max-width: auto; + max-width: none; padding: 0; } nav, article > :not(.slide), #pagenav { @@ -144,6 +144,7 @@ absolute-slide {...} */ .slide { height: 210mm; width: 297mm; + margin: 0; } } diff --git a/src/scripts/presentation.js b/src/scripts/presentation.js index 425815c..ba7dd66 100644 --- a/src/scripts/presentation.js +++ b/src/scripts/presentation.js @@ -79,20 +79,26 @@ presentBtn.addEventListener('click', function() { else { pageY = window.scrollY; pageX = window.scrollX; window.scrollTo(0, 0); - fixAbsoluteSlideScale(); } presenting = !presenting; + fixAbsoluteSlideScale(); }); function fixAbsoluteSlideScale() { - var scale = Math.min(window.innerHeight / slides[0].offsetHeight, window.innerWidth / slides[0].offsetWidth); + var height = (presenting) ? window.innerHeight : articleElem.offsetHeight; + var width = (presenting) ? window.innerWidth : articleElem.offsetWidth - 32; + var scale = Math.min(height / slides[0].offsetHeight, width / slides[0].offsetWidth); + // Update .slide + document.styleSheets.item(3).cssRules[0].style.transform = 'scale(' + scale + ')'; + document.styleSheets.item(3).cssRules[0].style.marginBottom = 'calc(1em - ' + slides[0].offsetHeight + 'px * ' + (1 - scale) + ')'; // Update .absolute-slide document.styleSheets.item(3).cssRules[1].style.transform = 'translate(-50%, -50%) scale(' + scale + ')'; // Update .clicked-image document.styleSheets.item(3).cssRules[2].style.transform = 'translate(-50%, -50%) scale(' + (1/scale) + ')'; } window.addEventListener('resize', fixAbsoluteSlideScale); +window.addEventListener('load', fixAbsoluteSlideScale); /* Show as article button */ diff --git a/src/styles.css b/src/styles.css index 79b0b83..2a14de5 100644 --- a/src/styles.css +++ b/src/styles.css @@ -423,7 +423,7 @@ dt, dd { /* Small screen support */ -@media screen and (max-width: 610px) { +@media screen and ((max-width: 610px) or (max-height: 610px)) { article { border-top: none; max-width: calc(100vw - 16px - 3px); @@ -460,6 +460,7 @@ dt, dd { } pre, code { white-space: pre-wrap !important; } + .slide, .absolute-slide { transform: none !important; margin: 0; } } /* presentation.js */ -- cgit v1.3.1-26-gb76a From 7e3f6667b9668f21c7c2b45d5c6e0a42b748c0fb Mon Sep 17 00:00:00 2001 From: Syndamia Date: Tue, 11 Jul 2023 12:46:08 +0300 Subject: (presentation) nodisplay is toggled dynamically, updated controller button styles and added labels where applicable --- awk-edits/Presentation.awk | 6 +++--- src/scripts/presentation.js | 14 +++++++++----- src/styles.css | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) (limited to 'awk-edits/Presentation.awk') diff --git a/awk-edits/Presentation.awk b/awk-edits/Presentation.awk index d1233c6..b0ed659 100644 --- a/awk-edits/Presentation.awk +++ b/awk-edits/Presentation.awk @@ -159,9 +159,9 @@ BEGIN { " \\←" ORS \ " 0" ORS \ " \\→" ORS \ -" \\☲" ORS \ -" \\⎚" ORS \ -" \\⎙" ORS \ +" Article view \\☲" ORS \ +" Present \\⎚" ORS \ +" Print \\⎙" ORS \ "

" ORS \ " " diff --git a/src/scripts/presentation.js b/src/scripts/presentation.js index ba7dd66..1a9b42c 100644 --- a/src/scripts/presentation.js +++ b/src/scripts/presentation.js @@ -65,11 +65,15 @@ presentBtn.addEventListener('click', function() { document.body.classList.toggle('body-bg-color'); // Show the slide controller presentCont.classList.toggle('absolute-cont'); - prevSlideBtn.classList.toggle('nodisplay'); - slideIndexShow.classList.toggle('nodisplay'); - nextSlideBtn.classList.toggle('nodisplay'); - articleBtn.classList.toggle('nodisplay'); - printBtn.classList.toggle('nodisplay'); + for (var i = presentCont.children.length - 1; i >= 0; i--) { + if (i == 4) continue; // presentBtn + presentCont.children[i].classList.toggle('nodisplay'); + } + presentBtn.classList.toggle('setting-btn'); + if (presentBtn.innerHTML[0] === 'P') + presentBtn.innerHTML = presentBtn.innerHTML.substr(8); + else + presentBtn.innerHTML = 'Present ' + presentBtn.innerHTML; // Show the first slide slides[slideIndex].classList.toggle('absolute-slide'); // Alignment of presentation to screen diff --git a/src/styles.css b/src/styles.css index 2a14de5..a8fd245 100644 --- a/src/styles.css +++ b/src/styles.css @@ -334,13 +334,13 @@ dt, dd { line-height: 1em; } .setting-btn { - font-size: 0.5em; text-align: center; display: inline-block; line-height: 1em; border: 1px solid var(--border-color); padding: 0.2em 0.3em 0.4em; } + #settingsWrapper > .setting-btn { font-size: 0.5em; } #footer { font-size: 0.7em; overflow-x: hidden; -- cgit v1.3.1-26-gb76a