Skip to content

Fixing small bugs in dark mode switcher #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed

Fixing small bugs in dark mode switcher #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0ca8a0b
fix dark mode switcher not functioning properly
Aug 30, 2023
5a4c5b1
Fix mouseover area of mode switcher not over icon
Aug 30, 2023
bbd87c5
Revert "Fix mouseover area of mode switcher not over icon"
Aug 30, 2023
a341257
Revert "fix dark mode switcher not functioning properly"
Aug 30, 2023
54f17c2
Fix dark mode button failure due to loading order
tyrochemist Aug 30, 2023
c297174
Fix onclick area not covering mode icon
tyrochemist Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 47 additions & 46 deletions _includes/Nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,55 +30,56 @@
{%- endcomment -%}

<nav class="navbar is-transparent" role="navigation" aria-label="main navigation">
<div class="navbar-brand">
<a class="navbar-item" style="padding-left: 0;"; href="{{ site.baseurl }}/index.html">
<h6> {{site.heading}}</h6></a>
<script src="{{ site.baseurl }}/assets/js/modeswitcher.js"></script>
<script src="{{ site.baseurl }}/assets/js/Hamburger.js"></script>
<div class="navbar-item navbar-dark-mode__mobile is-hidden-tablet" onclick="modeSwitcher()">
<div class="buttons">
<a class="button is-text">
<span class="icon is-small">
<img src="{{ '/assets/img/sun.svg' | relative_url }}" id="theme-toggle-img--mobile">
</span>
</a>
</div>
<div class="navbar-brand">
<a class="navbar-item" style="padding-left: 0;" ; href="{{ site.baseurl }}/index.html">
<h6> {{site.heading}}</h6>
</a>
<script src="{{ site.baseurl }}/assets/js/modeswitcher.js"></script>
<script src="{{ site.baseurl }}/assets/js/Hamburger.js"></script>
<div class="navbar-item navbar-dark-mode__mobile is-hidden-tablet" onclick="modeSwitcher()">
<div class="buttons">
<a class="button is-text">
<span class="icon is-small">
<img src="{{ '/assets/img/sun.svg' | relative_url }}" id="theme-toggle-img--mobile">
</span>
</a>
</div>
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</div>
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
</a>
</div>

<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-start">
<a href="{{'/notes' | relative_url}}" class="navbar-item">
Demo Feed
</a>
<a href="../post/how-to" class="navbar-item">
How To
</a>
<a href="https://github.com/Jekyll-Garden/jekyll-garden.github.io" target="_blank" class="navbar-item">
Github
</a>
<a href="https://jekyllrb.com/" target="_blank" class="navbar-item">
Jekyll
</a>
<a href="https://obsidian.md/" target="_blank" class="navbar-item">
Obsidian
</a>
</div>

<div id="navbarBasicExample" class="navbar-menu">
<div class="navbar-start">
<a href="{{'/notes' | relative_url}}" class="navbar-item">
Demo Feed
</a>
<a href="../post/how-to" class="navbar-item">
How To
</a>
<a href="https://github.com/Jekyll-Garden/jekyll-garden.github.io" target="_blank" class="navbar-item">
Github
</a>
<a href="https://jekyllrb.com/" target="_blank" class="navbar-item">
Jekyll
</a>
<a href="https://obsidian.md/" target="_blank" class="navbar-item">
Obsidian
</a>
</div>
<div class="navbar-end is-hidden-mobile" onclick="modeSwitcher()" >
<div class="navbar-item">
<div class="buttons">
<a class="button is-text">
<span class="icon is-small">
<img src="{{ '/assets/img/sun.svg' | relative_url }}" id="theme-toggle-img">
</span>
</a>
</div>
<div class="navbar-end is-hidden-mobile" onclick="modeSwitcher()">
<div class="navbar-item">
<div class="buttons">
<a class="button is-text" style="padding: 0.3rem;">
<span class="icon is-small" style="margin: 0;">
<img src="{{ '/assets/img/sun.svg' | relative_url }}" id="theme-toggle-img">
</span>
</a>
</div>
</div>
</div>
</nav>
</div>
</nav>
33 changes: 18 additions & 15 deletions assets/js/modeswitcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,24 @@ function changeIconImgSrc(src) {
document.getElementById("theme-toggle-img--mobile").src = src;
}

if (systemInitiatedDark.matches) {
changeIconImgSrc(iconMoon);
} else {
changeIconImgSrc(iconSun);
}
document.addEventListener("DOMContentLoaded", () => {
if (systemInitiatedDark.matches) {
changeIconImgSrc(iconMoon);
} else {
changeIconImgSrc(iconSun);
}
if (theme === "dark") {
document.documentElement.setAttribute('data-theme', 'dark');
sessionStorage.setItem('theme', 'dark');
changeIconImgSrc(iconMoon);
} else if (theme === "light") {
document.documentElement.setAttribute('data-theme', 'light');
sessionStorage.setItem('theme', 'light');
changeIconImgSrc(iconSun);
}
})



function prefersColorTest(systemInitiatedDark) {
if (systemInitiatedDark.matches) {
Expand Down Expand Up @@ -58,14 +71,4 @@ function modeSwitcher() {
sessionStorage.setItem('theme', 'dark');
changeIconImgSrc(iconMoon);
}
}

if (theme === "dark") {
document.documentElement.setAttribute('data-theme', 'dark');
sessionStorage.setItem('theme', 'dark');
changeIconImgSrc(iconMoon);
} else if (theme === "light") {
document.documentElement.setAttribute('data-theme', 'light');
sessionStorage.setItem('theme', 'light');
changeIconImgSrc(iconSun);
}