From 2cbfa603580ddbf2fdaed70172270e248995e208 Mon Sep 17 00:00:00 2001 From: Marcell Mars Date: Fri, 18 Dec 2020 23:18:38 +0100 Subject: [PATCH] !publish! --- .../SandpointsTheme/assets/css/site.css | 4 + .../SandpointsTheme/assets/js/sandpoints.js | 186 ++++++++++-------- .../layouts/partials/header.html | 2 +- _vendor/modules.txt | 2 +- content/curriculum/index.md | 2 +- 5 files changed, 116 insertions(+), 80 deletions(-) diff --git a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/css/site.css b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/css/site.css index 218b23d..cfc4cd0 100644 --- a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/css/site.css +++ b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/css/site.css @@ -307,6 +307,10 @@ body { color: black; } +#preview { + display: none; +} + sup, sub { vertical-align: baseline; diff --git a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/js/sandpoints.js b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/js/sandpoints.js index 8021e55..67da3d4 100644 --- a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/js/sandpoints.js +++ b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/assets/js/sandpoints.js @@ -1,83 +1,115 @@ -window.addEventListener('scroll', function(e) { - if (document.querySelector('body').clientWidth > 767) { - let rightcolumn = document.querySelector('.rightcolumn'); - let mantletitle = document.querySelector('.mantletitle') || document.querySelector('.crusttitle') || false; - if (!mantletitle) { - return - } - let mantlebar = document.querySelector('.mantlebar') - let grid = document.querySelector('.grid') - let gridrect = mantletitle.getBoundingClientRect(); - - if ((document.querySelector('body').clientHeight - (grid.clientHeight + mantletitle.clientHeight + 32)) < window.innerHeight) { - return - } - - if (gridrect.top < 20 && !grid.classList.contains('moved')) { - grid.classList.add('moved'); - mantlebar.style.display = "inline"; - mantletitle.style.visibility = "hidden"; - } else if (gridrect.top > 21 && grid.classList.contains('moved')) { - grid.classList.remove('moved'); - mantletitle.style.visibility = "visible"; - mantlebar.style.display = "none"; - } - } else { - let rightcolumn = document.querySelector('.rightcolumn'); - let mantletitle = document.querySelector('.mantletitle') || document.querySelector('.crusttitle') || false; - if (!mantletitle) { - return - } - let mantlebar = document.querySelector('.mantlebar') - let grid = document.querySelector('.grid') - let gridrect = mantletitle.getBoundingClientRect(); - - if (gridrect.top < 20 && !grid.classList.contains('moved')) { - grid.classList.add('moved'); - mantlebar.style.display = "inline"; - mantletitle.style.visibility = "hidden"; - } else if (gridrect.top > 21 && grid.classList.contains('moved')) { - grid.classList.remove('moved'); - mantletitle.style.visibility = "visible"; - mantlebar.style.display = "none"; - } +window.addEventListener("scroll", function (e) { + if (document.querySelector("body").clientWidth > 767) { + let rightcolumn = document.querySelector(".rightcolumn"); + let mantletitle = + document.querySelector(".mantletitle") || + document.querySelector(".crusttitle") || + false; + if (!mantletitle) { + return; } -}) - -window.addEventListener('DOMContentLoaded', (e) => { - let par = document.querySelector("#TableOfContents > ol:first-child > li:first-child"); - let s = document.createElement("span"); - s.appendChild(par.cloneNode(true)) - par.remove() - document.querySelector("#TableOfContents > ol:first-child").insertBefore(s, document.querySelector("#TableOfContents > ol:first-child").firstChild) - - if (document.querySelector(".soundcite")) { - let relPath ="../".repeat(relPathDepth - 1); - - var popcorn = document.createElement('script'); - popcorn.src = `${relPath}js/popcorn.min.js`; - document.body.appendChild(popcorn); - - var soundcite = document.createElement('script'); - soundcite.src = `${relPath}js/soundcite.min.js`; - document.body.appendChild(soundcite); + let mantlebar = document.querySelector(".mantlebar"); + let grid = document.querySelector(".grid"); + let gridrect = mantletitle.getBoundingClientRect(); + if ( + document.querySelector("body").clientHeight - + (grid.clientHeight + mantletitle.clientHeight + 32) < + window.innerHeight + ) { + return; } - document.querySelectorAll('#TableOfContents a, .anchorz, .footnote-backref, .footnote-ref').forEach(i => { - i.addEventListener('click', e => { - setTimeout(() => { - window.scrollBy({top: document.querySelector('.header').clientHeight * -1.25, behavior: 'smooth'})}, 50); - }) - }) -}) + if (gridrect.top < 20 && !grid.classList.contains("moved")) { + grid.classList.add("moved"); + mantlebar.style.display = "inline"; + mantletitle.style.visibility = "hidden"; + } else if (gridrect.top > 21 && grid.classList.contains("moved")) { + grid.classList.remove("moved"); + mantletitle.style.visibility = "visible"; + mantlebar.style.display = "none"; + } + } else { + let rightcolumn = document.querySelector(".rightcolumn"); + let mantletitle = + document.querySelector(".mantletitle") || + document.querySelector(".crusttitle") || + false; + if (!mantletitle) { + return; + } + let mantlebar = document.querySelector(".mantlebar"); + let grid = document.querySelector(".grid"); + let gridrect = mantletitle.getBoundingClientRect(); + + if (gridrect.top < 20 && !grid.classList.contains("moved")) { + grid.classList.add("moved"); + mantlebar.style.display = "inline"; + mantletitle.style.visibility = "hidden"; + } else if (gridrect.top > 21 && grid.classList.contains("moved")) { + grid.classList.remove("moved"); + mantletitle.style.visibility = "visible"; + mantlebar.style.display = "none"; + } + } +}); + +window.addEventListener("DOMContentLoaded", (e) => { + let preview = document.querySelector("#preview"); + if ( + location.pathname.split("/").includes("_preview") || + location.hash.startsWith("#/_edit") + ) { + preview.style.display = "block"; + } + + let par = document.querySelector( + "#TableOfContents > ol:first-child > li:first-child" + ); + let s = document.createElement("span"); + s.appendChild(par.cloneNode(true)); + par.remove(); + document + .querySelector("#TableOfContents > ol:first-child") + .insertBefore( + s, + document.querySelector("#TableOfContents > ol:first-child").firstChild + ); + + if (document.querySelector(".soundcite")) { + let relPath = "../".repeat(relPathDepth - 1); + + var popcorn = document.createElement("script"); + popcorn.src = `${relPath}js/popcorn.min.js`; + document.body.appendChild(popcorn); + + var soundcite = document.createElement("script"); + soundcite.src = `${relPath}js/soundcite.min.js`; + document.body.appendChild(soundcite); + } + + document + .querySelectorAll( + "#TableOfContents a, .anchorz, .footnote-backref, .footnote-ref" + ) + .forEach((i) => { + i.addEventListener("click", (e) => { + setTimeout(() => { + window.scrollBy({ + top: document.querySelector(".header").clientHeight * -1.25, + behavior: "smooth", + }); + }, 50); + }); + }); +}); toggleAllLinks = function () { - document.querySelectorAll('details').forEach(i => { - if (i.open) { - i.removeAttribute('open'); - } else { - i.setAttribute('open', true); - } - }) -} + document.querySelectorAll("details").forEach((i) => { + if (i.open) { + i.removeAttribute("open"); + } else { + i.setAttribute("open", true); + } + }); +}; diff --git a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/header.html b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/header.html index c77f7cf..fc5880a 100644 --- a/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/header.html +++ b/_vendor/git.sandpoints.org/Drawwell/SandpointsTheme/layouts/partials/header.html @@ -27,7 +27,7 @@ {{ end }} {{ if eq hugo.Environment "gitea" }} -
+
EDIT_THIS {{ with $scratch.core }}ADD_{{ index . 0 | upper }}{{ end }} {{ with $scratch.mantle }}ADD_{{ index . 0 | upper }}{{ end }} diff --git a/_vendor/modules.txt b/_vendor/modules.txt index 6be6f69..c1b686e 100644 --- a/_vendor/modules.txt +++ b/_vendor/modules.txt @@ -1 +1 @@ -# git.sandpoints.org/Drawwell/SandpointsTheme v0.0.0-20201218214106-9738d858fd47 +# git.sandpoints.org/Drawwell/SandpointsTheme v0.0.0-20201218221740-acab84a3b225 diff --git a/content/curriculum/index.md b/content/curriculum/index.md index d0b4c09..93d115d 100644 --- a/content/curriculum/index.md +++ b/content/curriculum/index.md @@ -5,7 +5,7 @@ has_topics: ["firsttopic.md", "secondtopic.md"] # Race Critical Theories, a curriculum -here i will make stupid dots.. +here i will make stupid dots....