From 9775b978934f7f9b76ede1865e86425bcde4a9e4 Mon Sep 17 00:00:00 2001 From: Aaron Qian Date: Sun, 13 Nov 2022 20:51:53 -0800 Subject: [PATCH] more fixes for broken achievements and small bugs --- .../scripts/features/darkmode/darkreader.js | 22 ++++++++++++------- assets/scripts/sections/achievements.js | 7 ++++-- layouts/_default/single.html | 4 ++-- layouts/partials/analytics.html | 2 ++ layouts/partials/header.html | 2 +- .../navigators/floating-lang-selector.html | 4 ++-- .../partials/navigators/lang-selector-2.html | 4 ++-- .../partials/navigators/lang-selector.html | 4 ++-- .../partials/sections/achievements/entry.html | 3 ++- static/css/sections/accomplishments.css | 1 + static/css/sections/achievements.css | 12 +++++----- 11 files changed, 39 insertions(+), 26 deletions(-) diff --git a/assets/scripts/features/darkmode/darkreader.js b/assets/scripts/features/darkmode/darkreader.js index d32f81c..a2c530f 100644 --- a/assets/scripts/features/darkmode/darkreader.js +++ b/assets/scripts/features/darkmode/darkreader.js @@ -1,13 +1,19 @@ import { enable, disable, auto, setFetchMethod } from 'darkreader'; -import { darkmode } from "@params"; +import * as params from "@params"; -const { - defaultColorScheme, - theme, - fixes, -} = darkmode.darkreader; - -setFetchMethod(window.fetch) +const darkreader = params?.darkmode?.darkreader || {}; +const defaultColorScheme = darkreader.defaultColorScheme || 'system'; +const theme = { + brightness: 100, + contrast: 100, + sepia: 0, + ...(darkreader.theme || {}), +}; +const fixes = { + invert: ['img[src$=".svg"]'], + ...(darkreader.fixes || {}), +}; +setFetchMethod(window.fetch); export function setSchemeDark() { enable(theme, fixes); diff --git a/assets/scripts/sections/achievements.js b/assets/scripts/sections/achievements.js index 7aa0ddc..a504fd6 100644 --- a/assets/scripts/sections/achievements.js +++ b/assets/scripts/sections/achievements.js @@ -1,3 +1,5 @@ +import { getDeviceState } from '../core'; + function fourColumRow(gallery, entries, i) { let entry1 = document.createElement("div"); entry1.classList.add("col-lg-6", "m-0", "p-0"); @@ -123,6 +125,7 @@ function singleColumnRow(gallery, entries, i) { } function showAchievements() { + const { isLaptop, isTablet } = getDeviceState() // show achievements from achievements-holder div let gallery = document.getElementById("gallery"); if (gallery == null) { @@ -204,8 +207,8 @@ function showAchievements() { this.children["caption"].classList.toggle("hidden"); } if (this.children["enlarge-icon"] != undefined) { - this.children["enlarge-icon"].classList.toggle("fa-search-plus"); - this.children["enlarge-icon"].classList.toggle("fa-times"); + this.getElementsByClassName('fa-xmark')[0].classList.toggle('hidden'); + this.getElementsByClassName('fa-magnifying-glass-plus')[0].classList.toggle('hidden'); } if (this.children["achievement-title"] != undefined) { this.children["achievement-title"].classList.toggle("hidden"); diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6c7e7e3..b7a5a83 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -54,7 +54,7 @@

{{ .Page.Title }}

- {{ if site.Params.enableTags }} + {{ if site.Params.features.tags.enable }}