Merge branch 'master' into v1
This commit is contained in:
		| @@ -3,7 +3,7 @@ import { useTheme } from 'next-themes' | ||||
|  | ||||
| const ThemeSwitch = () => { | ||||
|   const [mounted, setMounted] = useState(false) | ||||
|   const { theme, setTheme } = useTheme() | ||||
|   const { theme, setTheme, resolvedTheme } = useTheme() | ||||
|  | ||||
|   // When mounted on client, now we can show the UI | ||||
|   useEffect(() => setMounted(true), []) | ||||
| @@ -13,7 +13,7 @@ const ThemeSwitch = () => { | ||||
|       aria-label="Toggle Dark Mode" | ||||
|       type="button" | ||||
|       className="w-8 h-8 p-1 ml-1 mr-1 rounded sm:ml-4" | ||||
|       onClick={() => setTheme(theme === 'dark' ? 'light' : 'dark')} | ||||
|       onClick={() => setTheme(theme === 'dark' || resolvedTheme === 'dark' ? 'light' : 'dark')} | ||||
|     > | ||||
|       <svg | ||||
|         xmlns="http://www.w3.org/2000/svg" | ||||
| @@ -21,7 +21,7 @@ const ThemeSwitch = () => { | ||||
|         fill="currentColor" | ||||
|         className="text-gray-900 dark:text-gray-100" | ||||
|       > | ||||
|         {mounted && theme === 'dark' ? ( | ||||
|         {mounted && (theme === 'dark' || resolvedTheme === 'dark') ? ( | ||||
|           <path | ||||
|             fillRule="evenodd" | ||||
|             d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user