hematite 0.1.10 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d562db0ed2225f8650bd5c5f4a463b484254df5c5b6324eb7b2febf6f072e0d
-  data.tar.gz: 415dee3a5e09d9e84f0f2abb907f613bf68edf2a5224816995462148155415ad
+  metadata.gz: 5428a81a66f2c162d5db506a782443ab49ec31a2a2b67a02dec1cab941828768
+  data.tar.gz: 4a54bb491b61987364791315c6b4024b6fc019a3ba42f5488f43fb7f9c9ff704
 SHA512:
-  metadata.gz: f36ce4207f588d36389548a4755140b78738731be85582c8208e7092940254613e5241417825c7a47d0322b606be5958fd46ed593d971e5dc70ecd9b5a506357
-  data.tar.gz: daf31b575712939d9de6b0fd0c0500727736fd2da81e9e70c7eff7b2229c07f269ad3394c2231542c9594b2c65dccf08ebfa261ab1d42a10ac12782d9ccf82bf
+  metadata.gz: '08188e55d1fc0e2f342a186ac1cc57c0226fe7b138cdb5e2f622716b29f4a5cf41768220f9dafb3971d2081dfef5cbee1cb8f485cd6e041589b6a3472a63204f'
+  data.tar.gz: 1ddbfb8aa3b14052e0befc9e5dc6b59f1486705dc5f82033337a08a085368e27b6b1a51601db7e26b9578af0fafe74c0b3951a0e3fcda496ff5de23b35ad4b88

data/_config.yml

@@ -2,8 +2,8 @@
 # Settings for the demo site.
 # `jekyll serve` does not auto-reload this file.
 
-title: The Hematite Theme
-short_title: Hematite Theme
+title: Hematite Theme
+# short_title: Add a shortened version of the title for small screens
 description: A Jekyll theme intended for course websites
 permalink: pretty
 

data/_includes/img/loading_icon.svg

@@ -0,0 +1,70 @@
+<svg
+   viewBox="0 0 64.0 64.0"
+   version="1.1"
+   class="loading-icon-root"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <style>
+.loading-icon-root {
+    cursor: pointer;
+    width: 64px;
+    height: 64px;
+}
+
+.loading-icon-root .rect {
+    fill: var(--primary-text-color);
+
+    transform: translate(0, 0);
+    transform-origin: 32px 32px;
+    animation: loading-icon-anim 1.5s ease infinite;
+}
+
+.loading-icon-root .rect2 {
+    animation-delay: 0.25s;
+}
+
+.loading-icon-root .rect3 {
+    animation-delay: 0.5s;
+}
+
+.loading-icon-root .rect4 {
+    animation-delay: 0.65s;
+}
+
+@keyframes loading-icon-anim {
+    0% { transform: rotate(0); }
+    100% { transform: rotate(-360deg) scale(1, 1); }
+}
+  </style>
+  <g
+     id="layer1">
+    <rect
+       width="9"
+       height="9"
+       x="10"
+       y="10"
+       ry="4.5"
+       class="rect" />
+    <rect
+       width="9"
+       height="9"
+       x="10"
+       y="10"
+       ry="4.5"
+       class="rect rect2" />
+    <rect
+       width="9"
+       height="9"
+       x="10"
+       y="10"
+       ry="4.5"
+       class="rect rect3" />
+    <rect
+       width="9"
+       height="9"
+       x="10"
+       y="10"
+       ry="4.5"
+       class="rect rect4" />
+  </g>
+</svg>

data/_includes/scss/_fonts.scss

@@ -1,5 +1,5 @@
 
 @font-face {
     font-family: FoulisGreek;
-    src: url({{ assets/fonts/FoulisGreek.ttf | absolute_path }});
+    src: url({{ "assets/fonts/FoulisGreek.ttf" | relative_url }});
 }

data/_layouts/remark_slideshow.html

@@ -14,6 +14,12 @@ layout: default
 
 {% assign frame_resource_url = 'assets/html/remark_presentation_frame.html' | relative_url %}
 
+<div class='loading-icon-container'>
+    <center>
+        {% include img/loading_icon.svg %}
+    </center>
+</div>
+
 <main class="slideshow-mode">
     <iframe
             id="presentation_frame"
@@ -113,13 +119,18 @@ layout: default
         `);
 
         presentationWin.initPresentation = (async () => {
-            presentationDoc.title = presentationFrame.title;
-            await slideshow.start(presentationFrame.contentWindow, config);
-
-            // Ensure that mermaid has already been run!
-            if (presentationWin.mermaid) {
-                presentationWin.mermaid.init();
-                console.log("Ran mermaid!");
+            try {
+                presentationDoc.title = presentationFrame.title;
+                await slideshow.start(presentationFrame.contentWindow, config);
+
+                // Ensure that mermaid has already been run!
+                if (presentationWin.mermaid) {
+                    presentationWin.mermaid.init();
+                }
+            }
+            finally {
+                // Hide the loading icon
+                document.querySelector(".loading-icon-container")?.remove();
             }
         });
 

data/_sass/_layout.scss

@@ -178,6 +178,9 @@ main.slideshow-mode {
         // Transition immediately!
         transition: width 0s ease, max-width 0s ease;
     }
+
+    // Don't scroll, let the inner frame do that.
+    overflow: hidden;
 }
 
 // On mobile devices,

data/assets/html/remark_presentation_frame.html

@@ -20,7 +20,14 @@ h1, h2, h3 {
     font-weight: normal;
 }
 
-.remark-code, .remark-inline-code { font-family: 'Ubuntu Mono', monospace; }
+.remark-code, .remark-inline-code, body.mdSourceView {
+    font-family: 'Ubuntu Mono', monospace;
+}
+
+body.mdSourceView {
+    background: white;
+    color: black;
+}
 
 /* Show hidden slides to allow preprocessors (e.g. mermaid) to
    properly account for container size.

data/assets/js/layout/remark_slideshow.mjs

@@ -77,6 +77,20 @@ function focusSlideFromHash(slideshow) {
     }
 }
 
+/// Returns true iff the slide viewer should only display markdown.
+function shouldOnlyDisplayMd() {
+    let pageArgs = UrlHelper.getPageArgs();
+    if (!pageArgs) {
+        return false;
+    }
+
+    if (pageArgs.md_only) {
+        return true;
+    }
+
+    return false;
+}
+
 async function main(targetWindow, config) {
     // True if touch navigation is enabled.
     let usingCustomTouchNav = false;
@@ -88,6 +102,13 @@ async function main(targetWindow, config) {
         }));
     }
 
+    // If the user has requested that only the page's markdown be shown,
+    if (shouldOnlyDisplayMd()) {
+        targetWindow.document.body.innerText = config?.source;
+        targetWindow.document.body.classList.add('mdSourceView');
+        return;
+    }
+
     // Customize touchscreen navigation — the default remark
     // navigation can break buttons, zooming.
     if (config?.navigation?.touch === true
@@ -150,6 +171,7 @@ async function main(targetWindow, config) {
 
                 if (handlingGesture) {
                     evt.preventDefault();
+                    elemContainer.setPointerCapture();
                 }
             }
         });
@@ -205,16 +227,20 @@ function addExtendedControls(targetWindow, slideshow) {
         targetWindow.print();
     };
 
+    let updateBtns = (slideIdx) => {
+        prevSlideBtn.disabled = (slideIdx == 0);
+        nextSlideBtn.disabled = (slideIdx + 1 >= slideshow.getSlideCount());
+    };
+
     slideshow.on('showSlide', function(newSlide) {
         if (!newSlide) {
             return;
         }
 
-        prevSlideBtn.disabled = (newSlide.getSlideIndex() == 0);
-        nextSlideBtn.disabled = (newSlide.getSlideIndex() + 1 >= slideshow.getSlideCount());
+        updateBtns(newSlide.getSlideIndex());
     });
 
-
+    updateBtns(0);
 
     nav.replaceChildren(prevSlideBtn, nextSlideBtn, spacer, printBtn);
     targetWindow.document.body.appendChild(nav);

data/assets/js/search.mjs

@@ -50,15 +50,25 @@ class Searcher {
                 .replaceAll(/[&]ldquo;/g, '"')
                 .replaceAll(/[&]rdquo;/g, '"')
                 .replaceAll(/[&]amp;/g, "&")
+        // Remove the astrisks around **bolded** text
+                .replaceAll(/(\s|^)[*]{2}[^*]+[*]{2}(\s|$)/g, "$1$2$3")
+        // Remove the backticks around `text` that is code-formatted
+                .replaceAll(/(\s|^)[`]([^`]+)[`](\s|$)/g, "$1$2$3") // `
                 .replaceAll(/\s+/g, ' ');
 
     }
 
+    filterQuery_(query) {
+        return query
+            .toLowerCase()
+            .replaceAll(/\s+/g, ' ');
+    }
+
     /// Get number of full matches for [query] in [text].
     /// @precondition [text] is already in a searchable (i.e.
     /// filtered) form.
     getNumberOfMatches(query, text) {
-        query = query.toLowerCase();
+        query = this.filterQuery_(query);
 
         return text.toLowerCase().split(query).length - 1;
     }
@@ -68,7 +78,7 @@ class Searcher {
     /// is found.
     /// @precondition [text] is already in a searchable form.
     getIdxOfFirstMatch(query, text, startPos) {
-        query = query.toLowerCase();
+        query = this.filterQuery_(query);
 
         return text.toLowerCase().indexOf(query, startPos);
     }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hematite
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.13
 platform: ruby
 authors:
 - Henry Heino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-28 00:00:00.000000000 Z
+date: 2022-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -37,6 +37,7 @@ files:
 - _includes/extern_library_imports.html
 - _includes/footer.html
 - _includes/img/hamburger_menu.svg
+- _includes/img/loading_icon.svg
 - _includes/img/search_icon.svg
 - _includes/katex_includes.html
 - _includes/mermaid_includes.html