rework CSS and JS

current stage of CSS tests, but we'll switch drastically again
support SCSS
2024-01-30 22:47:35 +01:00 · 2024-01-30 14:39:01 +01:00 · 2024-01-30 12:34:28 +01:00 · 2024-01-30 12:29:32 +01:00 · 2024-01-30 12:18:28 +01:00
8 changed files with 431 additions and 88 deletions
--- a/static/css/snap-gallery.css
+++ b/static/css/snap-gallery.css
@@ -76,7 +76,7 @@ figure.no-border .snap-wrapper {
 /* avoid sick effects of inline-block on gallery elements */
 .snap-gallery .snap-wrapper {
  display: block;
-} 
+}

 .snap-gallery figure {
  position: relative;
@@ -140,7 +140,7 @@ figure.no-border .snap-wrapper {
  background: rgba(0,0,0,0.8);
 }

-/* effects when "activating" the figure */ 
+/* effects when "activating" the figure */
 .snap-lightbox:target {
  /** Remove default browser outline */
  outline: none;
--- a/assets/scss/snap-gallery.scss
+++ b/assets/scss/snap-gallery.scss
@@ -0,0 +1,187 @@
+.snap-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-around;
+  gap: 10px;
+}
+
+/* Create equal columns in flexbox */
+.snap-image {
+  // TODO: Make this configurable with variables
+  width: calc(100% / 4 - 10px);
+  min-width: 200px;
+
+  img {
+    aspect-ratio: 16/10;
+    width: 100%;
+    object-fit: cover;
+  }
+}
+
+.snap-lightbox {
+  /** Default lightbox to hidden */
+  display: none;
+
+  /** Position and style */
+  position: fixed;
+  z-index: 999;
+  width: 100%;
+  height: 100%;
+  text-align: center;
+  white-space: nowrap;
+  top: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.8);
+
+  /* keep lightbox in middle. TODO: hacky, and not realibly in middle */
+  &:before {
+    content: "";
+    display: inline-block;
+    vertical-align: middle;
+    width: 0;
+    /* adjust for white space between pseudo element and next sibling */
+    margin-right: -.25em;
+    /* stretch line height */
+    height: 100%;
+  }
+
+}
+
+// /* Click on the complete background closes the lightbox */
+// /* Exception: arrow in gallery, they have higher z-index */
+// a.snap-lightbox-close {
+//   position: fixed;
+//   z-index: 800;
+//   width: 100%;
+//   height: 100%;
+//   text-align: center;
+//   white-space: nowrap;
+//   top: 0;
+//   left: 0;
+// }
+
+/* Container for image */
+.snap-lightbox-inner {
+  display: inline-block;
+  vertical-align: middle;
+  white-space: normal;
+  max-width: 90%;
+  max-height: 80%;
+  height: 100%;
+
+  /* Number text (1/3 etc) */
+  .numbertext {
+    color: #f2f2f2;
+    background-color: #000;
+    font-size: 12px;
+    padding: 8px 12px;
+    position: absolute;
+    top: 10%;
+  }
+
+  img {
+    max-height: 100%;
+  }
+
+  // TODO: Untested
+  p {
+    color: #fff;
+    z-index: 810;
+    position: relative;
+  }
+}
+
+// /* Caption text */
+// .caption-container {
+//   text-align: center;
+//   background-color: black;
+//   padding: 2px 16px;
+//   color: white;
+// }
+
+/* prev/next arrows & close button */
+.snap-lightbox-prev,
+.snap-lightbox-next {
+  position: fixed;
+  z-index: 800;
+  width: 5%;
+  height: 100%;
+  text-align: center;
+  top: 0;
+
+  .snap-lightbox-arrow {
+    display: inline-block;
+    position: fixed;
+    top: 50%;
+    z-index: 900;
+    border: solid #fff;
+    border-width: 0 7px 7px 0;
+    display: inline-block;
+    padding: 1%;
+  }
+
+  &:hover>.snap-lightbox-arrow {
+    border-color: #999;
+    transition: all 0.25s ease;
+  }
+}
+
+.snap-lightbox-prev {
+  left: 0;
+
+  .snap-lightbox-arrow {
+    left: 2%;
+    transform: rotate(135deg);
+    -webkit-transform: rotate(135deg);
+  }
+}
+
+.snap-lightbox-next {
+  right: 0;
+
+  .snap-lightbox-arrow {
+    right: 2%;
+    transform: rotate(-45deg);
+    -webkit-transform: rotate(-45deg);
+  }
+}
+
+/* The Close Button */
+.snap-close {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  height: 50px;
+  width: 50px;
+  color: white;
+  font-size: 50px;
+  font-weight: bold;
+  z-index: 900;
+
+  &:hover,
+  &:focus {
+    color: #999;
+    text-decoration: none;
+    cursor: pointer;
+  }
+}
+
+@media screen and (max-width: 767px) {
+  .snap-lightbox-inner {
+    max-width: 80%;
+  }
+
+  .snap-lightbox-prev,
+  .snap-lightbox-next {
+    width: 10%;
+  }
+
+  .snap-lightbox-close-button {
+    width: 10%;
+    height: calc(10vw);
+    /* ~10% width */
+  }
+}
--- a/layouts/shortcodes/figure.bak.html
+++ b/layouts/shortcodes/figure.bak.html
@@ -0,0 +1,87 @@
+<!--
+  SPDX-FileCopyrightText: 2020 Max Mehl <mail@mehl.mx>
+  SPDX-License-Identifier: MIT
+-->
+<!-- count how many times we've called this shortcode; load the css if it's the first time -->
+{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/snap-gallery.css" />{{ end }}
+{{- $.Page.Scratch.Add "figurecount" 1 -}}
+<!-- use src image -->
+{{- $thumb := .Get "src" -}}
+
+<!-- set unique ID depending on whether part of gallery or alone -->
+{{- $figid := "" -}}
+{{- $galid := "" -}}
+{{- $id := "" -}}
+{{- $previd := "" -}}
+{{- $nextid := "" -}}
+{{- if .Parent -}} <!-- gallery -->
+  {{- $galid = .Page.Scratch.Get "gallery" -}}
+  {{- if not $galid }}{{ $galid = 0 }}{{ end -}}
+  {{- $galid = add $galid 1 -}}
+  {{- $.Page.Scratch.Add "thisgalfig" 1 -}}
+  {{- $figid = .Page.Scratch.Get "thisgalfig" -}}
+{{- else -}} <!-- standalone figure -->
+  {{- $.Page.Scratch.Add "nogalfig" 1 -}}
+  {{- $figid = .Page.Scratch.Get "nogalfig" -}}
+{{- end -}}
+{{- if $galid -}} <!-- gallery -->
+  {{- $id = print "gal" $galid "-" "fig" $figid -}}
+  {{- $previd = print "gal" $galid "-" "fig" (sub $figid 1) -}}
+  {{- $nextid = print "gal" $galid "-" "fig" (add $figid 1) -}}
+{{- else -}} <!-- standalone figure -->
+  {{- $id = print "fig" $figid -}}
+{{- end -}}
+
+<figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
+  <div class="snap-wrapper">
+    {{ if (.Get "link") -}}
+      <a href="{{ .Get "link" }}"
+         {{- with .Get "target" }} target="{{ . }}"{{ end -}}
+         {{- with .Get "rel" }} rel="{{ . }}"{{ end -}}
+         >
+    {{ else -}}
+      {{ if not (eq (.Get "lightbox") "none") }}<a href="#{{ $id }}">{{ end }}
+    {{- end -}}
+    <!-- THUMBNAIL -->
+      <img src="{{ $thumb | relURL }}" class="snap-thumb"
+      {{- with .Get "alt" }} alt="{{ . }}"{{ end -}}
+      {{- with .Get "title" }} title="{{ . }}"{{ end -}}
+      {{- with .Get "height" }} height="{{ . }}"{{ end -}}
+      {{- with .Get "width" }} width="{{ . }}"{{ end -}}
+       />
+      {{- if or (.Get "caption") (.Get "attr")}}
+        <figcaption>
+          {{- .Get "caption" | markdownify -}}
+          {{- with .Get "attr" }} {{ . | markdownify}}{{ end -}}
+        </figcaption>
+      {{- end }}
+    </a>
+    <!-- FULL IMAGE; HIDDEN -->
+    {{- if not (eq (.Get "lightbox") "none") -}}
+      <div class="snap-lightbox" id="{{ $id }}">
+        <a href="#_" class="snap-lightbox-close"></a>
+        <div class="snap-lightbox-inner">
+          <img src="{{ .Get "src" }}" {{ with .Get "alt" }}alt="{{ . }}"{{ end }} />
+          <p>
+          {{- if or (.Get "caption") (.Get "attr") -}}
+            {{- .Get "caption" | markdownify -}}
+            {{- with .Get "attrlink" }} <a href="{{ . }}">{{- end -}}
+            {{- with .Get "attr" }} {{ . | markdownify}}{{ end -}}
+            {{- with .Get "attrlink" }}</a>{{- end -}}
+          {{- end }}
+          </p>
+        </div>
+        <a href="#_" class="snap-lightbox-close-button"><i class="snap-lightbox-x"></i></a>
+        {{- if .Parent -}}
+          {{- if not (eq $figid 1) -}}
+            <a href="#{{ $previd }}" class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></a>
+          {{- else -}}
+            <span class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></span>
+          {{- end -}}
+          <!-- TODO: Somehow try to identify whether this is the last element in the gallery -->
+          <a href="#{{ $nextid }}" class="snap-lightbox-next"><i class="snap-lightbox-arrow"></i></a>
+        {{- end }}
+      </div>
+    {{- end -}}
+  </div>
+</figure>
--- a/layouts/shortcodes/figure.html
+++ b/layouts/shortcodes/figure.html
@@ -1,87 +1,68 @@
-<!--
-  SPDX-FileCopyrightText: 2020 Max Mehl <mail@mehl.mx>
-  SPDX-License-Identifier: MIT
-->
-<!-- count how many times we've called this shortcode; load the css if it's the first time -->
-{{- if not ($.Page.Scratch.Get "figurecount") }}<link rel="stylesheet" href="/css/snap-gallery.css" />{{ end }}
-{{- $.Page.Scratch.Add "figurecount" 1 -}}
-<!-- use src image -->
-{{- $thumb := .Get "src" -}}
-
-<!-- set unique ID depending on whether part of gallery or alone -->
-{{- $figid := "" -}}
-{{- $galid := "" -}}
-{{- $id := "" -}}
-{{- $previd := "" -}}
-{{- $nextid := "" -}}
-{{- if .Parent -}} <!-- gallery -->
-  {{- $galid = .Page.Scratch.Get "gallery" -}}
-  {{- if not $galid }}{{ $galid = 0 }}{{ end -}}
-  {{- $galid = add $galid 1 -}}
-  {{- $.Page.Scratch.Add "thisgalfig" 1 -}}
-  {{- $figid = .Page.Scratch.Get "thisgalfig" -}}
-{{- else -}} <!-- standalone figure -->
-  {{- $.Page.Scratch.Add "nogalfig" 1 -}}
-  {{- $figid = .Page.Scratch.Get "nogalfig" -}}
-{{- end -}}
-{{- if $galid -}} <!-- gallery -->
-  {{- $id = print "gal" $galid "-" "fig" $figid -}}
-  {{- $previd = print "gal" $galid "-" "fig" (sub $figid 1) -}}
-  {{- $nextid = print "gal" $galid "-" "fig" (add $figid 1) -}}
-{{- else -}} <!-- standalone figure -->
-  {{- $id = print "fig" $figid -}}
-{{- end -}}
-
-<figure {{ with .Get "class" }}class="{{.}}"{{ end }}>
-  <div class="snap-wrapper">
-    {{ if (.Get "link") -}}
-      <a href="{{ .Get "link" }}"
-         {{- with .Get "target" }} target="{{ . }}"{{ end -}}
-         {{- with .Get "rel" }} rel="{{ . }}"{{ end -}}
-         >
-    {{ else -}}
-      {{ if not (eq (.Get "lightbox") "none") }}<a href="#{{ $id }}">{{ end }}
-    {{- end -}}
-    <!-- THUMBNAIL -->
-      <img src="{{ $thumb | relURL }}" class="snap-thumb"
-      {{- with .Get "alt" }} alt="{{ . }}"{{ end -}}
-      {{- with .Get "title" }} title="{{ . }}"{{ end -}}
-      {{- with .Get "height" }} height="{{ . }}"{{ end -}}
-      {{- with .Get "width" }} width="{{ . }}"{{ end -}}
-       />
-      {{- if or (.Get "caption") (.Get "attr")}}
-        <figcaption>
-          {{- .Get "caption" | markdownify -}}
-          {{- with .Get "attr" }} {{ . | markdownify}}{{ end -}}
-        </figcaption>
-      {{- end }}
-    </a>
-    <!-- FULL IMAGE; HIDDEN -->
-    {{- if not (eq (.Get "lightbox") "none") -}}
-      <div class="snap-lightbox" id="{{ $id }}">
-        <a href="#_" class="snap-lightbox-close"></a>
-        <div class="snap-lightbox-inner">
-          <img src="{{ .Get "src" }}" {{ with .Get "alt" }}alt="{{ . }}"{{ end }} />
-          <p>
-          {{- if or (.Get "caption") (.Get "attr") -}}
-            {{- .Get "caption" | markdownify -}}
-            {{- with .Get "attrlink" }} <a href="{{ . }}">{{- end -}}
-            {{- with .Get "attr" }} {{ . | markdownify}}{{ end -}}
-            {{- with .Get "attrlink" }}</a>{{- end -}}
-          {{- end }}
-          </p>
-        </div>
-        <a href="#_" class="snap-lightbox-close-button"><i class="snap-lightbox-x"></i></a>
-        {{- if .Parent -}}
-          {{- if not (eq $figid 1) -}}
-            <a href="#{{ $previd }}" class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></a>
-          {{- else -}}
-            <span class="snap-lightbox-prev"><i class="snap-lightbox-arrow"></i></span>
-          {{- end -}}
-          <!-- TODO: Somehow try to identify whether this is the last element in the gallery -->
-          <a href="#{{ $nextid }}" class="snap-lightbox-next"><i class="snap-lightbox-arrow"></i></a>
-        {{- end }}
-      </div>
-    {{- end -}}
+<!-- Images used to open the lightbox -->
+<div class="row">
+  <div class="column">
+    <img src="img1.jpg" onclick="openModal();currentSlide(1)" class="hover-shadow">
  </div>
-</figure>
+  <div class="column">
+    <img src="img2.jpg" onclick="openModal();currentSlide(2)" class="hover-shadow">
+  </div>
+  <div class="column">
+    <img src="img3.jpg" onclick="openModal();currentSlide(3)" class="hover-shadow">
+  </div>
+  <div class="column">
+    <img src="img4.jpg" onclick="openModal();currentSlide(4)" class="hover-shadow">
+  </div>
+</div>
+
+<!-- The Modal/Lightbox -->
+<div id="myModal" class="modal">
+  <span class="close cursor" onclick="closeModal()">&times;</span>
+  <div class="modal-content">
+
+    <div class="mySlides">
+      <div class="numbertext">1 / 4</div>
+      <img src="img1.jpg" style="width:100%">
+    </div>
+
+    <div class="mySlides">
+      <div class="numbertext">2 / 4</div>
+      <img src="img2.jpg" style="width:100%">
+    </div>
+
+    <div class="mySlides">
+      <div class="numbertext">3 / 4</div>
+      <img src="img3.jpg" style="width:100%">
+    </div>
+
+    <div class="mySlides">
+      <div class="numbertext">4 / 4</div>
+      <img src="img4.jpg" style="width:100%">
+    </div>
+
+    <!-- Next/previous controls -->
+    <a class="prev" onclick="plusSlides(-1)">&#10094;</a>
+    <a class="next" onclick="plusSlides(1)">&#10095;</a>
+
+    <!-- Caption text -->
+    <div class="caption-container">
+      <p id="caption"></p>
+    </div>
+
+    <!-- Thumbnail image controls -->
+    <div class="column">
+      <img class="demo" src="img1.jpg" onclick="currentSlide(1)" alt="Nature">
+    </div>
+
+    <div class="column">
+      <img class="demo" src="img2.jpg" onclick="currentSlide(2)" alt="Snow">
+    </div>
+
+    <div class="column">
+      <img class="demo" src="img3.jpg" onclick="currentSlide(3)" alt="Mountains">
+    </div>
+
+    <div class="column">
+      <img class="demo" src="img4.jpg" onclick="currentSlide(4)" alt="Lights">
+    </div>
+  </div>
+</div>
--- a/layouts/shortcodes/gallery.bak.html
+++ b/layouts/shortcodes/gallery.bak.html
--- a/layouts/shortcodes/snap-dir.bak.html
+++ b/layouts/shortcodes/snap-dir.bak.html
--- a/layouts/shortcodes/snap-gallery.html
+++ b/layouts/shortcodes/snap-gallery.html
@@ -0,0 +1,55 @@
+{{/*  TODO: Ensure CSS/JS is only loaded once  */}}
+{{- with resources.Get "scss/snap-gallery.scss" | toCSS }}
+<link rel="stylesheet" href="{{ .RelPermalink }}" crossorigin="anonymous">
+{{- end }}
+
+{{/*  Initialise variables  */}}
+{{ $imgs := slice }}
+
+{{/*  Get/sanitise image paths  */}}
+{{ if .Params.isdir }}
+  {{/*  Get images from folder, put into map  */}}
+  {{ $imgdir := print "/static/" .Params.src }}
+  {{- range readDir $imgdir -}}
+  {{ $imgs = $imgs | append (print $.Params.src "/" .Name ) }}
+  {{ end }}
+{{ else }}
+  {{/*  Get images from src Param, separated by comma  */}}
+  {{ range (split .Params.src ",") }}
+    {{ $imgs = $imgs | append (trim . " ") }}
+  {{ end }}
+{{ end }}
+
+{{/*  Visible images  */}}
+<div class="snap-wrapper">
+{{ range $i, $img := $imgs }}
+  <div class="snap-image">
+    <img src="{{ $img }}" onclick="openModal();currentSlide({{ add $i 1 }});" class="hover-shadow">
+  </div>
+{{ end }}
+</div>
+
+{{/*  The Modal/Lightbox  */}}
+<div class="snap-lightbox">
+  {{ range $i, $img := $imgs }}
+  <div class="snap-lightbox-inner">
+    <div class="numbertext">{{ add $i 1 }} / {{ len $imgs }}</div>
+    <img src="{{ $img }}" style="width:100%">
+  </div>
+  {{ end }}
+
+  <!-- Close and Next/previous controls -->
+  <span class="snap-close" onclick="closeModal()">&times;</span>
+
+  <a class="snap-lightbox-prev" onclick="plusSlides(-1)"><i class="snap-lightbox-arrow"></i></a>
+  <a class="snap-lightbox-next" onclick="plusSlides(1)"><i class="snap-lightbox-arrow"></i></a>
+  {{/*  <a class="prev" onclick="plusSlides(-1)">&#10094;</a>
+  <a class="next" onclick="plusSlides(1)">&#10095;</a>  */}}
+
+  {{/*  <!-- Caption text -->
+  <div class="caption-container">
+    <p id="caption"></p>
+  </div>  */}}
+</div>
+
+<script src="/js/snap-gallery.js"></script>
--- a/static/js/snap-gallery.js
+++ b/static/js/snap-gallery.js
@@ -0,0 +1,33 @@
+// Open the Modal
+function openModal() {
+  document.getElementsByClassName("snap-lightbox")[0].style.display = "block";
+}
+
+// Close the Modal
+function closeModal() {
+  document.getElementsByClassName("snap-lightbox")[0].style.display = "none";
+}
+
+var slideIndex = 1;
+showSlides(slideIndex);
+
+// Next/previous controls
+function plusSlides(n) {
+  showSlides(slideIndex += n);
+}
+
+// Thumbnail image controls
+function currentSlide(n) {
+  showSlides(slideIndex = n);
+}
+
+function showSlides(n) {
+  var i;
+  var slides = document.getElementsByClassName("snap-lightbox-inner");
+  if (n > slides.length) { slideIndex = 1 }
+  if (n < 1) { slideIndex = slides.length }
+  for (i = 0; i < slides.length; i++) {
+    slides[i].style.display = "none";
+  }
+  slides[slideIndex - 1].style.display = "inline-block";
+}
Author	SHA1	Message	Date
Max Mehl	4b5fe07ece	rework CSS and JS	2024-01-30 22:47:35 +01:00
Max Mehl	8e426a6611	current stage of CSS tests, but we'll switch drastically again	2024-01-30 14:39:01 +01:00
Max Mehl	adcd4c4ee0	support SCSS	2024-01-30 12:34:28 +01:00
Max Mehl	c79c9cd1fc	support reading files from directory	2024-01-30 12:29:32 +01:00
Max Mehl	33fbd81151	first work into renewed gallery	2024-01-30 12:18:28 +01:00