diff --git a/src/components/helpers/tooltip/Tooltip.jsx b/src/components/helpers/tooltip/Tooltip.jsx index 07442702..55b6261e 100644 --- a/src/components/helpers/tooltip/Tooltip.jsx +++ b/src/components/helpers/tooltip/Tooltip.jsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import { useFloating, flip, offset, shift } from '@floating-ui/react-dom'; import './tooltip.scss'; -export default function Tooltip({ children, title, style, placement }) { +export default function Tooltip({ children, title, style, placement, subtitle }) { const [showTooltip, setShowTooltip] = useState(false); const { x, y, reference, floating, strategy } = useFloating({ placement: placement || 'bottom', @@ -27,10 +27,13 @@ export default function Tooltip({ children, title, style, placement }) { position: strategy, top: y ?? '', left: x ?? '', + display: 'flex', + flexFlow: 'column', }} className="tooltipTitle" > {title} + {subtitle} )} diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx index 3aecf98a..b8902adc 100644 --- a/src/components/widgets/navbar/Navbar.jsx +++ b/src/components/widgets/navbar/Navbar.jsx @@ -19,13 +19,14 @@ export default class Navbar extends PureComponent { this.refreshValue = localStorage.getItem('refreshOption'); this.state = { classList: localStorage.getItem('widgetStyle') === 'legacy' ? 'navbar old' : 'navbar new', + refreshText: '', }; } setZoom() { this.setState({ - zoomFontSize: Number(((localStorage.getItem('zoomNavbar') || 100) / 100) * 1.2) + "rem" - }) + zoomFontSize: Number(((localStorage.getItem('zoomNavbar') || 100) / 100) * 1.2) + 'rem', + }); } componentDidMount() { @@ -40,6 +41,29 @@ export default class Navbar extends PureComponent { } }); + if (localStorage.getItem('refreshOption') === 'background') { + this.setState({ + refreshText: variables.getMessage('modals.main.settings.sections.background.title'), + }); + } else if (localStorage.getItem('refreshOption') === 'quote') { + this.setState({ + refreshText: variables.getMessage('modals.main.settings.sections.quote.title'), + }); + } else if (localStorage.getItem('refreshOption') === 'quotebackground') { + this.setState({ + refreshText: + variables.getMessage('modals.main.settings.sections.quote.title') + + ' ' + + variables.getMessage('modals.main.settings.sections.background.title'), + }); + } else { + this.setState({ + refreshText: variables.getMessage( + 'modals.main.settings.sections.appearance.navbar.refresh_options.page', + ), + }); + } + this.setZoom(); } @@ -61,14 +85,23 @@ export default class Navbar extends PureComponent { const backgroundEnabled = localStorage.getItem('background') === 'true'; const navbar = ( -
-
- {localStorage.getItem('view') === 'true' && backgroundEnabled ? : null} - {localStorage.getItem('notesEnabled') === 'true' ? : null} - {localStorage.getItem('todo') === 'true' ? : null} +
+
+ {localStorage.getItem('view') === 'true' && backgroundEnabled ? ( + + ) : null} + {localStorage.getItem('notesEnabled') === 'true' ? ( + + ) : null} + {localStorage.getItem('todo') === 'true' ? ( + + ) : null} {this.refreshEnabled !== 'false' ? ( - + @@ -81,7 +114,10 @@ export default class Navbar extends PureComponent { ), })} > - diff --git a/src/components/widgets/search/search_engines.json b/src/components/widgets/search/search_engines.json index aef6f2b2..ee651da8 100644 --- a/src/components/widgets/search/search_engines.json +++ b/src/components/widgets/search/search_engines.json @@ -54,6 +54,7 @@ { "name": "百度", "settingsName": "baidu", - "url": "https://www.baidu.com/s?wd=" + "url": "https://www.baidu.com/s", + "query": "wd" } ]