Skip to content

Added dark mode support #130

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

Open
TTalex wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added dark mode support #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion code/Nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import LogoSansTexte from 'Images/fabmob_cmjn6.svg'
import { useLocation } from 'react-router-dom'
import { useContext } from 'react'
import { WikiContext } from './App'
import ColorSchemeToggle from './components/ColorSchemeToggle'

const MenuLink = (setClosed) => ({ to, children }) => (
<RouterLink to={to} onClick={() => setClosed()}>
Expand Down Expand Up @@ -53,7 +54,7 @@ export default () => {
display: block;
}
ul > li > a {
color: black;
color: var(--color-text);
}
.emoji {
margin: 0;
Expand Down Expand Up @@ -113,6 +114,9 @@ export default () => {
>
<Link to="/participer">Participer</Link>
</li>
<li>
<ColorSchemeToggle />
</li>
{false && (
<li>
<LangSwitch />
Expand Down
15 changes: 15 additions & 0 deletions code/components/ColorSchemeToggle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { DarkModeToggle } from "react-dark-mode-toggle-2";
import { useColorScheme } from '../scripts/ColorScheme';

const ColorSchemeToggle = () => {
const [ value, setValue ] = useColorScheme();
return (
<DarkModeToggle
onChange={setValue}
isDarkMode={value}
size={40}
/>
);
};

export default ColorSchemeToggle;
55 changes: 37 additions & 18 deletions code/main.css.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,31 @@ export default `
--width-content: 1080px;
}

/*
@media (prefers-color-scheme: dark) {
:root {
--color: #0097fc;
--color-accent: #0097fc4f;
--color-bg: #333;
--color-bg-secondary: #555;
--color-secondary: #e20de9;
--color-secondary-accent: #e20de94f;
--color-shadow: #bbbbbb20;
--color-text: #f7f7f7;
--color-text-secondary: #aaa;
}
}
*/
body.dark {
--color: #0097fc;
--color-accent: #0097fc4f;
--color-bg: #333;
--color-bg-secondary: #555;
// --color-secondary: #e20de9;
--color-secondary-accent: #e20de94f;
--color-shadow: #bbbbbb20;
--color-text: #f7f7f7;
--color-text-secondary: #aaa;
}
// @media (prefers-color-scheme: dark) {
// :root {
// --color: #0097fc;
// --color-accent: #0097fc4f;
// --color-bg: #333;
// --color-bg-secondary: #555;
// // --color-secondary: #e20de9;
// --color-secondary-accent: #e20de94f;
// --color-shadow: #bbbbbb20;
// --color-text: #f7f7f7;
// --color-text-secondary: #aaa;
// }
// }


/* open-sans-regular - latin */
@font-face {
Expand Down Expand Up @@ -211,7 +221,7 @@ h4,
h5,
h6 {
line-height: var(--line-height);
color: black
color: var(--color-text)
}

mark {
Expand Down Expand Up @@ -280,6 +290,7 @@ button {
line-height: var(--line-height);
margin: 1.5rem 0 0.5rem 0;
padding: 1rem 2rem;
color: var(--color-text);
}

button {
Expand All @@ -290,12 +301,20 @@ button {
}

button:hover {
background: black;
background: gray;
color: white;
cursor: pointer;
filter: brightness(var(--hover-brightness));
}

nav button:hover {
background: transparent;
}
nav button {
height: 24px;
padding: 0;
margin: 0;
vertical-align: middle;
}

/* Images */
figure {
Expand Down
21 changes: 21 additions & 0 deletions code/scripts/ColorScheme.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { useEffect, useMemo } from 'react';
import createPersistedState from 'use-persisted-state';

const useColorSchemeState = createPersistedState('colorScheme');

export function useColorScheme() {
const systemPrefersDark = window.matchMedia("(prefers-color-scheme: dark)").matches
const [isDark, setIsDark] = useColorSchemeState();
const value = useMemo(() => isDark === undefined ? !!systemPrefersDark : isDark,
[isDark, systemPrefersDark])
useEffect(() => {
if (value) {
console.log("add dark")
document.body.classList.add('dark');
} else {
console.log("rm dark")
document.body.classList.remove('dark');
}
}, [value]);
return [value, setIsDark]
}
2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"process": "^0.11.10",
"raw-loader": "^4.0.2",
"react": "17.0.1",
"react-dark-mode-toggle-2": "^2.0.5",
"react-dom": "17.0.1",
"react-helmet": "^6.1.0",
"react-highlight-words": "^0.17.0",
Expand All @@ -27,6 +28,7 @@
"remark-footnotes": "^3.0.0",
"twemoji": "^13.0.1",
"url-loader": "^4.1.1",
"use-persisted-state": "^0.3.3",
"yaml-loader": "^0.6.0"
},
"devDependencies": {
Expand Down