diff --git a/src/components/helpers/tooltip/tooltip.scss b/src/components/helpers/tooltip/tooltip.scss index 92947945..14b98667 100644 --- a/src/components/helpers/tooltip/tooltip.scss +++ b/src/components/helpers/tooltip/tooltip.scss @@ -17,17 +17,21 @@ left: 50%; margin-left: -30px; visibility: hidden; + cursor: initial; + user-select: none; opacity: 0; transition: opacity 0.8s; } + + &:hover { + .tooltipTitle { + visibility: visible; + opacity: 0.8; + } + } } -.tooltip:hover .tooltipTitle { - visibility: visible; - opacity: 0.8; -} - -.dark .tooltip { +.dark .tooltipTitle { background-color: #000000; color: #ffffff; } diff --git a/src/components/widgets/background/Maximise.jsx b/src/components/widgets/background/Maximise.jsx index 7752ff09..306b2b91 100644 --- a/src/components/widgets/background/Maximise.jsx +++ b/src/components/widgets/background/Maximise.jsx @@ -4,7 +4,7 @@ import Tooltip from '../../helpers/tooltip/Tooltip'; import FullscreenIcon from '@material-ui/icons/Fullscreen'; -export default class View extends React.PureComponent { +export default class Maximise extends React.PureComponent { constructor() { super(); this.state = { diff --git a/src/components/widgets/navbar/Notes.jsx b/src/components/widgets/navbar/Notes.jsx index 1d94d6b5..cced379c 100644 --- a/src/components/widgets/navbar/Notes.jsx +++ b/src/components/widgets/navbar/Notes.jsx @@ -33,10 +33,10 @@ export default class Notes extends React.PureComponent { } } - // todo: fix this copy() { - navigator.clipboard.writeText(this.state.notes); - toast(window.language.toasts.copy); + // this.state.notes doesnt work for some reason + navigator.clipboard.writeText(localStorage.getItem('notes')); + toast(window.language.toasts.notes); } componentDidMount() { diff --git a/src/components/widgets/weather/Weather.jsx b/src/components/widgets/weather/Weather.jsx index e2de72c1..a15cad61 100644 --- a/src/components/widgets/weather/Weather.jsx +++ b/src/components/widgets/weather/Weather.jsx @@ -26,6 +26,10 @@ export default class Weather extends React.PureComponent { } async getWeather() { + if (localStorage.getItem('offlineMode') === 'true') { + return null; + } + let data = { weather: [ { @@ -111,6 +115,10 @@ export default class Weather extends React.PureComponent { return (localStorage.getItem(setting) === 'true'); }; + if (enabled('offlineMode')) { + return null; + } + if (this.state.location === window.language.widgets.weather.not_found) { return (
{this.state.location} @@ -118,8 +126,8 @@ export default class Weather extends React.PureComponent { } const minmax = () => { - const mintemp = (localStorage.getItem('mintemp') === 'true'); - const maxtemp = (localStorage.getItem('maxtemp') === 'true'); + const mintemp = enabled('mintemp'); + const maxtemp = enabled('maxtemp'); if (!mintemp && !maxtemp) { return null; diff --git a/src/components/widgets/weather/weather.scss b/src/components/widgets/weather/weather.scss index 62b042a8..0a67a8f3 100644 --- a/src/components/widgets/weather/weather.scss +++ b/src/components/widgets/weather/weather.scss @@ -5,15 +5,16 @@ cursor: initial; user-select: none; padding: 20px; - background-color: rgba(0, 0, 0, 0.5); + background-color: rgba(255, 255, 255, 0.8); + color: black; border-radius: 20px; span { - text-shadow: 0 0 10px rgb(0 0 0 / 50%); + text-shadow: 0 0 10px rgb(255 255 255 / 50%); } svg { - filter: drop-shadow(0 0 6px rgba(0, 0, 0, 0.1)); + filter: drop-shadow(0 0 6px rgba(255, 255, 255, 0.1)); vertical-align: middle; font-size: 35px; } @@ -28,3 +29,18 @@ font-size: 0.5em; } } + +.dark .weather { + background-color: rgba(0, 0, 0, 0.5); + color: white; + + span { + text-shadow: 0 0 10px rgb(0 0 0 / 50%); + } + + svg { + filter: drop-shadow(0 0 6px rgba(0, 0, 0, 0.1)); + vertical-align: middle; + font-size: 35px; + } +} \ No newline at end of file diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index 471d630b..e7a6e35d 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Kopierte zitate", - "note": "Kopierte notizen", + "notes": "Kopierte notizen", "reset": "Reset successfully", "installed": "Erfolgreich installiert", "uninstalled": "Erfolgreich entfernt", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index d0f6b11c..cc23b41f 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Quote copied", - "note": "Notes copied", + "notes": "Notes copied", "reset": "Reset successfully", "installed": "Successfully installed", "uninstalled": "Successfully removed", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 2bd8d929..90d2b527 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Quote copied", - "note": "Notes copied", + "notes": "Notes copied", "reset": "Reset successfully", "installed": "Successfully installed", "uninstalled": "Successfully removed", diff --git a/src/translations/es.json b/src/translations/es.json index ea117080..897141c4 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Cita copiada", - "note": "Notes copied", + "notes": "Notes copied", "reset": "Restablecido correctamente", "installed": "Instalado correctamente", "uninstalled": "Retirado correctamente", diff --git a/src/translations/fr.json b/src/translations/fr.json index eb023784..f7c8e850 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Citation copiée", - "note": "Remarques copiée", + "notes": "Remarques copiée", "reset": "Réinitialisé avec succès", "installed": "Installé avec succès", "uninstalled": "Enlevé avec succès", diff --git a/src/translations/nl.json b/src/translations/nl.json index e2062851..e0f604ca 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Het citaat is gekopieerd", - "note": "Notes copied", + "notes": "Notes copied", "reset": "Het herstellen is voltooid", "installed": "De installatie is voltooid", "uninstalled": "Het verwijderen is voltooid", diff --git a/src/translations/no.json b/src/translations/no.json index 9e08d774..6e30d312 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Sitat kopiert", - "note": "Notes copied", + "notes": "Notes copied", "reset": "Tilbakestillte vellykket", "installed": "Installert", "uninstalled": "Fjernet", diff --git a/src/translations/ru.json b/src/translations/ru.json index 90fc36d0..af96c40c 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "Цитата скопирована", - "note": "Notes copied", + "notes": "Notes copied", "reset": "Сброшено", "installed": "Успешно установлено", "uninstalled": "Успешно удалено", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index e3b23ff3..1f58fc73 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -361,7 +361,7 @@ }, "toasts": { "quote": "名言已复制", - "note": "Notes copied", + "notes": "Notes copied", "reset": "重置成功", "installed": "安装成功", "uninstalled": "卸载成功",