Dark Mode Support

JorjaFox · Oct 23, 2024 · 11c5877 · 11c5877
1 parent 0e7ecf3
commit 11c5877
Show file tree

Hide file tree

Showing 10 changed files with 68 additions and 56 deletions.
diff --git a/config/_default/menus.en.yaml b/config/_default/menus.en.yaml
@@ -39,21 +39,6 @@ main:
 footer:
 - name: Links
   weight: 10
-- name: Privacy Policy
-  parent: Links
-  pre: "fas fa-lock"
-  pageRef: /tos/privacy/
-  weight: 10
-- name: Terms of Service
-  parent: Links
-  pre: "fas fa-file-contract"
-  pageRef: /tos/
-  weight: 20
-- name: Copyright
-  parent: Links
-  pre: "fas fa-copyright"
-  pageRef: /tos/copyright/
-  weight: 30
 - name: Contribute
   parent: Links
   pre: "fab fa-github"

diff --git a/content/assets/scss/hugo.scss b/content/assets/scss/hugo.scss
@@ -1,5 +1,4 @@
 /* Stars */
-
 .rating {
     display: inline-flex;
 }
@@ -73,7 +72,6 @@ nav#NewsListOfYears ul, nav#TranscriptsListOfYears ul {
 }
 
 /* Personas */
-
 #nav-as-seen-on {
     h2, h3, button {
         font-style: italic;
@@ -96,3 +94,8 @@ nav#NewsListOfYears ul, nav#TranscriptsListOfYears ul {
 figcaption.blockquote-footer {
     margin-top: 10px;
 }
+
+/* Cards */
+h5.card-header {
+    margin-top: 0!important;
+}
diff --git a/layouts/_default/metabox/actor.html b/layouts/_default/metabox/actor.html
@@ -37,10 +37,10 @@
 <!-- Excerpt/Details -->
 <div class="text-body-secondary">
     {{- if $unverified -}}{{- partial "unconfirmed.html" -}}{{- end -}}
-    <div class="card text-bg-light">
+    <div class="card bg-light-subtle">
         <div class="card-header">
             {{- if $character -}}
-                <h5 class="card-title text-center">{{ $character }}</h5>
+                <h4 class="card-title text-center">{{ $character }}</h4>
                 {{- if $chartype -}}<h6 class="text-center"><small> ({{ $chartype }} character)</small></h6>{{- end -}}
             {{- end -}}
             {{- if ne $thumbnail "/img/placeholder.jpg" -}}
@@ -52,11 +52,11 @@ <h5 class="card-title text-center">{{ $character }}</h5>
             <center><img src="{{ $thumbnail }}" class="img-thumbnail" alt="{{ $character }}"></center>
         </div>
             <ul class="list-group list-group-flush actor-list-group">
-                {{- if $year -}}<li class="list-group-item">{{- partial "assets/icon.html" (dict "icon" "fas calendar-day") -}} <strong>Airdates:</strong> {{ $year }}</li>{{- end -}}
-                {{- if $genre -}}<li class="list-group-item">{{- partial "assets/icon.html" (dict "icon" "fas masks-theater") -}} <strong>Genre:</strong> {{ $genre }}</li>{{- end -}}
-                {{- if $station -}}<li class="list-group-item">{{- partial "assets/icon.html" (dict "icon" "fas tv") -}} <strong>Network:</strong> {{ if .Params.website }}<a href="{{ .Params.website }}" target="_blank">{{ $station }}</a>{{- else -}}{{ $station }}{{ end }}</li>{{- end -}}
-                {{- if .Params.imdb -}}<li class="list-group-item"><a href="{{ .Params.imdb }}" target="_blank">{{- partial "assets/icon.html" (dict "icon" "fab imdb") -}} IMDb</a></li>{{- end -}}
-                {{- if .Params.episodelist -}}<li class="list-group-item">
+                {{- if $year -}}<li class="list-group-item list-group-item-light">{{- partial "assets/icon.html" (dict "icon" "fas calendar-day") -}} <strong>Airdates:</strong> {{ $year }}</li>{{- end -}}
+                {{- if $genre -}}<li class="list-group-item list-group-item-light">{{- partial "assets/icon.html" (dict "icon" "fas masks-theater") -}} <strong>Genre:</strong> {{ $genre }}</li>{{- end -}}
+                {{- if $station -}}<li class="list-group-item list-group-item-light">{{- partial "assets/icon.html" (dict "icon" "fas tv") -}} <strong>Network:</strong> {{ if .Params.website }}<a href="{{ .Params.website }}" target="_blank">{{ $station }}</a>{{- else -}}{{ $station }}{{ end }}</li>{{- end -}}
+                {{- if .Params.imdb -}}<li class="list-group-item list-group-item-light"><a href="{{ .Params.imdb }}" target="_blank">{{- partial "assets/icon.html" (dict "icon" "fab imdb") -}} IMDb</a></li>{{- end -}}
+                {{- if .Params.episodelist -}}<li class="list-group-item list-group-item-light">
                     <a href="/library/recaps/{{- .File.TranslationBaseName -}}/">{{- partial "assets/icon.html" (dict "icon" "fas table-list") -}} List of Appearances</a>
                     {{- if or $seasons $episodes}}
                         <br /><small>(
@@ -69,7 +69,7 @@ <h5 class="card-title text-center">{{ $character }}</h5>
                 </li>{{- end -}}
                 {{- if and ($rating) (ne $rating "fake") -}}
                     {{- .Page.Scratch.Set "goldstar" $rating -}}
-                    <li class="list-group-item text-center">{{- partial "rating.html" (dict "rating" $rating ) -}}</li>
+                    <li class="list-group-item text-center list-group-item-light">{{- partial "rating.html" (dict "rating" $rating ) -}}</li>
                 {{- end -}}
             </ul>
     </div>

diff --git a/layouts/_default/metabox/recap.html b/layouts/_default/metabox/recap.html
@@ -10,7 +10,7 @@
 
 {{ $goldstar := .Page.Scratch.Get "goldstar" }}
 
-<div class="card text-bg-light">
+<div class="card bg-light-subtle">
     <div class="card-body">
         <h5 class="card-title text-center">"{{ title .Title }}"</h5>
         <h6 class="card-subtitle mb-2 text-body-secondary text-center">

diff --git a/layouts/partials/footer/footer.html b/layouts/partials/footer/footer.html
@@ -0,0 +1,12 @@
+<footer class="container-fluid footer text-center p-3">
+    <div class="container-xxl text-center">
+        <small>
+            {{- $copyright := printf "%s © %s %s %s." (T "copyright") (dateFormat "2006" now) .Site.Title (T "rights") }}
+            {{ cond (gt (len .Site.Copyright) 0) .Site.Copyright $copyright }}
+            {{ .Site.Params.footer.license | safeHTML }} |
+            {{ partial "assets/link.html" (dict "destination" "/tos/" "text" "Terms of Use" "class" "link-bg-footer" "page" .Page) }} |
+            {{ partial "assets/link.html" (dict "destination" "/tos/privacy" "text" "Privacy" "class" "link-bg-footer" "page" .Page) }} |
+            {{ partial "assets/link.html" (dict "destination" "/tos/copyright" "text" "Copyright" "class" "link-bg-footer" "page" .Page) }}
+        </small>
+    </div>
+</footer>
diff --git a/layouts/partials/footer/social.html b/layouts/partials/footer/social.html
@@ -1,48 +1,62 @@
-{{- $version := partial "assets/version.html" . -}}
-{{- $license := .Site.Params.footer.license | safeHTML -}}
-{{- $description := .Site.Params.main.description | safeHTML -}}
-{{- $title := site.Title -}}
-{{- $baseurl := urls.Parse $.Site.Params.Baseurl -}}
+{{ if .Site.Params.footer.socialTitle }}
+    {{ warnf "DEPRECATED: parameter `Params.home.socialTitle` has been deprecated in release v0.18"}}
+{{ end }}
+{{ if .Site.Params.footer.socialCaption }}
+    {{ warnf "DEPRECATED: parameter `Params.home.socialCaption` has been deprecated in release v0.18"}}
+{{ end }}
 
 {{- $page := . -}}
 {{- if not $page -}}
     {{- errorf "partial [footer/footer.html] - Missing value for param 'page'" -}}
 {{- end -}}
 
-<footer class="container-fluid footer p-0 border-top bg-primary bg-opacity-{{ .Site.Params.style.themeOpacity | default "25" | safeHTML }}">
+<div class="container-fluid bg-primary bg-opacity-{{ .Site.Params.style.themeOpacity | default "25" | safeHTML }}">
     <div class="container-xxl px-3 px-xxl-0 py-5">
         <div class="row">
             <div class="col-md-4 small">
                 <div class="text-sm-start">
                     <p><em>Fans of LeFox</em> is a fan run website with the goal of sharing information about actress, advocate, and humanitarian, Jorja Fox.</p>
-                    <div class="fs-md-5 fs-6 fw-bold footer-muted">Follow Jorja Fox</div>
-                    {{ range .Site.Menus.social -}}
+                    {{- range .Site.Menus.footer -}}
+                        <div class="fs-md-5 fs-6 fw-bold footer-muted">{{ .Name }}</div>
+                        {{- range .Children -}}
+                            <div class="py-1">
+                                {{- partial "assets/navbar-item.html" (dict "menu" . "page" $page "class" "link-bg-footer") -}}
+                            </div>
+                        {{- end -}}
+                    {{- end -}}
+                </div>
+            </div>
+            <div class="col-md-4 small">
+                <div class="fs-md-5 fs-6 fw-bold footer-muted">Follow Jorja Fox</div>
+                <div class="d-none-dark">
+                    {{- range .Site.Menus.social -}}
                         <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" aria-label="{{ .Name | safeHTML }}" class="text-decoration-none link-secondary d-inline p-2">
                             {{ if hasPrefix .Pre "<i" }}
                                 {{ .Pre | safeHTML }}
                             {{ else }}
                                 {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-2x" .Pre) )}}
                             {{ end }}
                         </a>
-                    {{ end -}}
+                    {{- end -}}
                 </div>
-            </div>
-            <div class="col-md-4 small">
-                {{ range .Site.Menus.footer -}}
-                    <div class="fs-md-5 fs-6 fw-bold footer-muted">{{ .Name }}</div>
-                    {{- range .Children -}}
-                        <div class="py-1">
-                            {{- partial "assets/navbar-item.html" (dict "menu" . "page" $page "class" "link-bg-footer") -}}
-                        </div>
+                <div class="d-none-light">
+                    {{- range .Site.Menus.social -}}
+                        <a href="{{ .URL }}" target="_blank" rel="noopener noreferrer" aria-label="{{ .Name | safeHTML }}" class="text-decoration-none link-light d-inline p-2">
+                            {{ if hasPrefix .Pre "<i" }}
+                                {{ .Pre | safeHTML }}
+                            {{ else }}
+                                {{ partial "assets/icon.html" (dict "icon" (printf "%s fa-2x" .Pre) )}}
+                            {{ end }}
+                        </a>
                     {{- end -}}
-                {{- end -}}
+                </div>
             </div>
             <div class="col-md-4 small">
-                {{ partial "mailinglist.html" (dict "headermsg" "Join the Fans of LeFox Announcement List" "listname" "announcements" "display" "main") }}
+                {{- partial "mailinglist.html" (dict "headermsg" "Join the Fans of LeFox Announcement List" "listname" "announcements" "display" "main") -}}
             </div>
         </div>
     </div>
-</footer>
+</div>
 
 <!--
 Fans of LeFox © 1996 by Mika A. Epstein.

diff --git a/layouts/partials/mailinglist.html b/layouts/partials/mailinglist.html
@@ -3,9 +3,7 @@
 {{- $display   := .display -}}
 
 <div class="card">
-    <div class="card-header">
-        {{ $headermsg}}
-    </div>
+    <h5 class="card-header">{{ $headermsg}}</h5>
     <div class="card-body">
         <form method="post" action="https://scripts.dreamhost.com/add_list.cgi">
 

diff --git a/layouts/partials/recaps/chronology.html b/layouts/partials/recaps/chronology.html
@@ -27,7 +27,7 @@ <h6>Episode Chronology</h6>
             {{- $prev_name := index ($ep_array) $previousep -}}
             {{- range $episodes -}}
                 {{- if eq $prev_name .title -}}
-                    <li class="list-group-item flex-fill borderless text-start">
+                    <li class="list-group-item flex-fill borderless text-start list-group-item-light">
                         {{- partial "assets/icon.html" (dict "icon" "fas arrow-left") -}}
                         <a href="/library/recaps/{{ $showslug }}/{{ .slug }}/">{{ $prev_name }}</a></li>
                 {{- end -}}
@@ -39,7 +39,7 @@ <h6>Episode Chronology</h6>
             {{- $next_name  := index ($ep_array) $nextep -}}
             {{- range $episodes -}}
                 {{- if eq $next_name .title -}}
-                    <li class="list-group-item flex-fill borderless text-end">
+                    <li class="list-group-item flex-fill borderless text-end list-group-item-light">
                         <a href="/library/recaps/{{ $showslug }}/{{ .slug }}/">{{ $next_name }}</a>
                         {{- partial "assets/icon.html" (dict "icon" "fas arrow-right") -}}
                     </li>

diff --git a/layouts/partials/recaps/episode.html b/layouts/partials/recaps/episode.html
@@ -7,11 +7,11 @@
 {{- range $episodes -}}
     {{- if eq .title $eptitle -}}
         <ul class="list-group list-group-flush">
-            <li class="list-group-item"><a href="/library/recaps/{{ $showslug }}/#season-{{ .season }}">{{- partial "assets/icon.html" (dict "icon" "fas tv text-success") -}} Season {{ .season }}</a></li>
-            <li class="list-group-item">{{- partial "assets/icon.html" (dict "icon" "fas hashtag") -}} Episode {{ .epnum }}{{- if .prodnum}} ({{ .prodnum }}){{- end -}}</li>
-            <li class="list-group-item">{{- partial "assets/icon.html" (dict "icon" "fa calendar-days") -}} {{ dateFormat "02 January 2006" .airdate }}</li>
+            <li class="list-group-item list-group-item-light"><a href="/library/recaps/{{ $showslug }}/#season-{{ .season }}">{{- partial "assets/icon.html" (dict "icon" "fas tv text-success") -}} Season {{ .season }}</a></li>
+            <li class="list-group-item list-group-item-light">{{- partial "assets/icon.html" (dict "icon" "fas hashtag") -}} Episode {{ .epnum }}{{- if .prodnum}} ({{ .prodnum }}){{- end -}}</li>
+            <li class="list-group-item list-group-item-light">{{- partial "assets/icon.html" (dict "icon" "fa calendar-days") -}} {{ dateFormat "02 January 2006" .airdate }}</li>
             {{- if $photogallery -}}
-                <li class="list-group-item"><a href="#gallery" aria-labelledby="gallery">{{- partial "assets/icon.html" (dict "icon" "fa images text-success") -}} Gallery</a></li>
+                <li class="list-group-item list-group-item-light"><a href="#gallery" aria-labelledby="gallery">{{- partial "assets/icon.html" (dict "icon" "fa images text-success") -}} Gallery</a></li>
             {{- end -}}
         </ul>
     {{- end -}}

diff --git a/layouts/shortcodes/episodelist.html b/layouts/shortcodes/episodelist.html
@@ -2,7 +2,7 @@
 {{ $show     := $.Page.Params.show }}
 {{ $episodes := (index .Site.Data.episodes $.Page.Params.show).episodes }}
 
-<table class="table table-borderless table-episodelist">
+<table class="table table-episodelist">
 	<thead class="table-secondary">
 		<tr>
 			<th scope="col">#</th>