Skip to content
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.

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

fix: scrollbar color on dark mode #431

Merged
merged 2 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion src/layout/ThemeContext.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// ThemeContext.js
import React, { FC, PropsWithChildren, createContext, useContext, useState } from 'react'
import { ThemeProvider as MuiThemeProvider, createTheme } from '@mui/material/styles'
import ScopedCssBaseline from '@mui/material/ScopedCssBaseline'
import { ConfigProvider, theme } from 'antd'
import heIL from 'antd/es/locale/he_IL'
import { useTranslation } from 'react-i18next'
Expand Down Expand Up @@ -44,7 +45,9 @@ export const ThemeProvider: FC<PropsWithChildren> = ({ children }) => {
algorithm: isDarkTheme ? darkAlgorithm : defaultAlgorithm,
}}>
<MuiThemeProvider theme={isDarkTheme ? darkTheme : lightTheme}>
<ThemeContext.Provider value={contextValue}> {children} </ThemeContext.Provider>
<ScopedCssBaseline enableColorScheme>
<ThemeContext.Provider value={contextValue}> {children} </ThemeContext.Provider>
</ScopedCssBaseline>
</MuiThemeProvider>
</ConfigProvider>
)
Expand Down
7 changes: 7 additions & 0 deletions src/layout/header/ToggleThemeButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import { useTranslation } from 'react-i18next'
import { BulbFilled, BulbOutlined } from '@ant-design/icons'

interface ToggleThemeButtonProps {
Expand All @@ -7,10 +8,16 @@ interface ToggleThemeButtonProps {
}

const ToggleThemeButton: React.FC<ToggleThemeButtonProps> = ({ toggleTheme, isDarkTheme }) => {
const { t } = useTranslation()

const tooltip_title = isDarkTheme ? t('light_mode_tooltip') : t('dark_mode_tooltip')

return (
<button
className="theme-icon"
onClick={toggleTheme}
aria-label={tooltip_title}
title={tooltip_title}
style={{ border: 'none', background: 'transparent', cursor: 'pointer' }}>
{isDarkTheme ? (
<BulbOutlined style={{ color: '#fff', fontSize: '1.5em' }} />
Expand Down
2 changes: 2 additions & 0 deletions src/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
"migdal_company": "\"A tower in the community\"",
"and_smaller_donors": "And other small contributions from my friends and fans of the workshop.",
"github_link": "Go to GitHub",
"dark_mode_tooltip": "Move to Dark mode",
"light_mode_tooltip": "Move to Light mode",
"Change Language": "שנה שפה",
"bug_title": "Title/Summary",
"bug_title_message": "Please enter a title/summary!",
Expand Down
2 changes: 2 additions & 0 deletions src/locale/he.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
"and_smaller_donors": "ותרומות קטנות נוספות של ידידי ואוהדי הסדנא.",
"gaps_patterns_page_title": "דפוסי נסיעות שלא יצאו",
"github_link": "למעבר אל GitHub",
"dark_mode_tooltip": "עבור למצב חשוך",
"light_mode_tooltip": "עבור למצב בהיר",
"Change Language": "Change Language",
"bug_title": "כותרת/סיכום",
"bug_title_message": "אנא הזן כותרת/סיכום!",
Expand Down
Loading