From 34cf1f095700f3623a80c23c31d3e2172f7f7c1d Mon Sep 17 00:00:00 2001 From: George Cushen Date: Tue, 5 Feb 2019 18:07:45 +0000 Subject: [PATCH] fix: when toggling day/night mode, also toggle code highlighting theme Fix case where code highlighting can be difficult to read after night mode is toggled by user as the highlight theme remained unchanged. --- assets/js/academic.js | 8 ++++++++ layouts/partials/header.html | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/assets/js/academic.js b/assets/js/academic.js index f3f2f035..e49f75d2 100644 --- a/assets/js/academic.js +++ b/assets/js/academic.js @@ -274,12 +274,16 @@ if ($('body').hasClass('dark')) { $('body').css({opacity: 0, visibility: 'visible'}).animate({opacity: 1}, 500); $('body').removeClass('dark'); + $('link[title=hl-light]')[0].disabled = false; + $('link[title=hl-dark]')[0].disabled = true; $('.js-dark-toggle i').removeClass('fa-sun'); $('.js-dark-toggle i').addClass('fa-moon'); localStorage.setItem('dark_mode', '0'); } else { $('body').css({opacity: 0, visibility: 'visible'}).animate({opacity: 1}, 500); $('body').addClass('dark'); + $('link[title=hl-light]')[0].disabled = true; + $('link[title=hl-dark]')[0].disabled = false; $('.js-dark-toggle i').removeClass('fa-moon'); $('.js-dark-toggle i').addClass('fa-sun'); localStorage.setItem('dark_mode', '1'); @@ -299,10 +303,14 @@ let dark_mode = parseInt(localStorage.getItem('dark_mode') || default_mode); if (dark_mode) { $('body').addClass('dark'); + $('link[title=hl-light]')[0].disabled = true; + $('link[title=hl-dark]')[0].disabled = false; $('.js-dark-toggle i').removeClass('fa-moon'); $('.js-dark-toggle i').addClass('fa-sun'); } else { $('body').removeClass('dark'); + $('link[title=hl-light]')[0].disabled = false; + $('link[title=hl-dark]')[0].disabled = true; $('.js-dark-toggle i').removeClass('fa-sun'); $('.js-dark-toggle i').addClass('fa-moon'); } diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 684fcaa3..3f30c463 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -77,9 +77,11 @@ {{ printf "" (printf $css.highlight.url $css.highlight.version .) | safeHTML }} {{ else }} {{ if eq ($scr.Get "light") true }} - {{ printf "" (printf $css.highlight.url $css.highlight.version "github") | safeHTML }} + {{ printf "" (printf $css.highlight.url $css.highlight.version "github") | safeHTML }} + {{ printf "" (printf $css.highlight.url $css.highlight.version "dracula") | safeHTML }} {{ else }} - {{ printf "" (printf $css.highlight.url $css.highlight.version "dracula") | safeHTML }} + {{ printf "" (printf $css.highlight.url $css.highlight.version "github") | safeHTML }} + {{ printf "" (printf $css.highlight.url $css.highlight.version "dracula") | safeHTML }} {{ end }} {{ end }} {{ end }}