diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx index 7dd09560..3b3653ee 100644 --- a/src/components/modals/main/settings/sections/About.jsx +++ b/src/components/modals/main/settings/sections/About.jsx @@ -26,6 +26,7 @@ export default class About extends React.PureComponent { async getGitHubData() { let contributors, sponsors, photographers, versionData; + try { contributors = await (await fetch(window.constants.GITHUB_URL + '/repos/mue/mue/contributors', { signal: this.controller.signal })).json(); sponsors = (await (await fetch(window.constants.SPONSORS_URL + '/list', { signal: this.controller.signal })).json()).sponsors; diff --git a/src/components/modals/main/settings/sections/Appearance.jsx b/src/components/modals/main/settings/sections/Appearance.jsx index d2daac6c..c8aa61b5 100644 --- a/src/components/modals/main/settings/sections/Appearance.jsx +++ b/src/components/modals/main/settings/sections/Appearance.jsx @@ -32,7 +32,6 @@ export default function AppearanceSettings() {

{appearance.navbar.title}

-

{appearance.font.title}

diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx index 1375f512..2b99fb62 100644 --- a/src/components/widgets/background/Background.jsx +++ b/src/components/widgets/background/Background.jsx @@ -299,7 +299,10 @@ export default class Background extends React.PureComponent { document.getElementById('backgroundVideo').style.display = 'block'; } else { if (this.state.photoInfo.hidden === false) { - document.querySelector('.photoInformation').style.display = 'block'; + // fix bug + try { + document.querySelector('.photoInformation').style.display = 'block'; + } catch (e) {} } element.style.display = 'block'; diff --git a/src/components/widgets/navbar/Navbar.jsx b/src/components/widgets/navbar/Navbar.jsx index 2795b831..522bc5ce 100644 --- a/src/components/widgets/navbar/Navbar.jsx +++ b/src/components/widgets/navbar/Navbar.jsx @@ -13,40 +13,35 @@ import Tooltip from '../../helpers/tooltip/Tooltip'; import './scss/index.scss'; export default function Navbar(props) { - const language = window.language; - const backgroundEnabled = (localStorage.getItem('background') === 'true'); return ( - <> - {(localStorage.getItem('navbarHover') === 'true') ?
: null} -
- {(localStorage.getItem('view') === 'true' && backgroundEnabled) ? : null} - {(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? : null} +
+ {(localStorage.getItem('view') === 'true' && backgroundEnabled) ? : null} + {(localStorage.getItem('favouriteEnabled') === 'true' && backgroundEnabled) ? : null} - {(localStorage.getItem('notesEnabled') === 'true') ? -
- - -
- :null} + {(localStorage.getItem('notesEnabled') === 'true') ? +
+ + +
+ : null} - {(window.constants.BETA_VERSION === true) ? - - props.openModal('feedbackModal')}/> - - : null} - - {(localStorage.getItem('refresh') === 'true') ? - - window.location.reload()}/> - - : null} - - - props.openModal('mainModal')}/> + {(window.constants.BETA_VERSION === true) ? + + props.openModal('feedbackModal')}/> -
- + : null} + + {(localStorage.getItem('refresh') === 'true') ? + + window.location.reload()}/> + + : null} + + + props.openModal('mainModal')}/> + +
); } diff --git a/src/components/widgets/navbar/scss/index.scss b/src/components/widgets/navbar/scss/index.scss index 9eb1b929..bd13d697 100644 --- a/src/components/widgets/navbar/scss/index.scss +++ b/src/components/widgets/navbar/scss/index.scss @@ -36,24 +36,3 @@ .visibilityshow { visibility: visible !important; } - -.navbar-hidden { - position: absolute; - width: 50vw; - right: 0; - top: 0; - background: none; - height: 75px; - - +.navbar-container { - display: none; - } - - &:hover { - display: block; - - +.navbar-container { - display: block !important; - } - } -} diff --git a/src/modules/default_settings.json b/src/modules/default_settings.json index a6e64cc0..b35a10a0 100644 --- a/src/modules/default_settings.json +++ b/src/modules/default_settings.json @@ -222,5 +222,9 @@ { "name": "apiQuality", "value": "high" + }, + { + "name": "photoInformation", + "value": true } ] diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index f0668846..3421ef69 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -227,8 +227,7 @@ "navbar": { "title": "Navigationsleiste", "notes": "Notizen", - "refresh": "Aktualisieren", - "hover": "Display on hover" + "refresh": "Aktualisieren" }, "font": { "title": "Schriftart", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 7e678a1d..48e8a9d5 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -108,9 +108,9 @@ }, "quote": { "title": "Quote", - "author_link": "Authour link", + "author_link": "Author link", "custom": "Custom quote", - "custom_author": "Custom authour", + "custom_author": "Custom author", "buttons": { "title": "Buttons", "copy": "Copy", @@ -227,8 +227,7 @@ "navbar": { "title": "Navbar", "notes": "Notes", - "refresh": "Refresh button", - "hover": "Display on hover" + "refresh": "Refresh button" }, "font": { "title": "Font", @@ -331,7 +330,7 @@ "information": "Information", "last_updated": "Last Updated", "version": "Version", - "author": "Authour", + "author": "Author", "buttons": { "addtomue": "Add To Mue", "remove": "Remove" diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 3feb92d2..0d685398 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -227,8 +227,7 @@ "navbar": { "title": "Navbar", "notes": "Notes", - "refresh": "Refresh button", - "hover": "Display on hover" + "refresh": "Refresh button" }, "font": { "title": "Font", diff --git a/src/translations/es.json b/src/translations/es.json index 1943a3f3..c84b0c2c 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -227,8 +227,7 @@ "navbar": { "title": "Barra de búsqueda", "notes": "Notas", - "refresh": "Botón de recargar", - "hover": "Display on hover" + "refresh": "Botón de recargar" }, "font": { "title": "Fuente", diff --git a/src/translations/fr.json b/src/translations/fr.json index c3e248fb..ede2cfd3 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -227,8 +227,7 @@ "navbar": { "title": "Navbar", "notes": "Notes", - "refresh": "Refresh button", - "hover": "Display on hover" + "refresh": "Refresh button" }, "font": { "title": "Font", diff --git a/src/translations/nl.json b/src/translations/nl.json index 8c79151a..01a43f22 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -108,9 +108,9 @@ }, "quote": { "title": "Citaat", - "author_link": "Authour link", + "author_link": "Author link", "custom": "Custom quote", - "custom_author": "Custom authour", + "custom_author": "Custom author", "buttons": { "title": "Buttons", "copy": "Kopieerknop", @@ -227,8 +227,7 @@ "navbar": { "title": "Navbar", "notes": "Notes", - "refresh": "Refresh button", - "hover": "Display on hover" + "refresh": "Refresh button" }, "font": { "title": "Font", diff --git a/src/translations/no.json b/src/translations/no.json index 51cffd11..6f98ff03 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -108,9 +108,9 @@ }, "quote": { "title": "Sitat", - "author_link": "Authour link", + "author_link": "Author link", "custom": "Custom quote", - "custom_author": "Custom authour", + "custom_author": "Custom author", "buttons": { "title": "Buttons", "copy": "Kopier knapp", @@ -227,8 +227,7 @@ "navbar": { "title": "Navbar", "notes": "Notes", - "refresh": "Refresh button", - "hover": "Display on hover" + "refresh": "Refresh button" }, "font": { "title": "Font", diff --git a/src/translations/ru.json b/src/translations/ru.json index ac33026f..987ac0b4 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -108,9 +108,9 @@ }, "quote": { "title": "Цитата", - "author_link": "Authour link", + "author_link": "Author link", "custom": "Custom quote", - "custom_author": "Custom authour", + "custom_author": "Custom author", "buttons": { "title": "Buttons", "copy": "Кнопка копирования", @@ -227,8 +227,7 @@ "navbar": { "title": "Navbar", "notes": "Notes", - "refresh": "Refresh button", - "hover": "Display on hover" + "refresh": "Refresh button" }, "font": { "title": "Font", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index 597df935..21859be9 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -108,9 +108,9 @@ }, "quote": { "title": "名言", - "author_link": "Authour link", + "author_link": "Author link", "custom": "Custom quote", - "custom_author": "Custom authour", + "custom_author": "Custom author", "buttons": { "title": "Buttons", "copy": "复制按钮", @@ -227,8 +227,7 @@ "navbar": { "title": "Navbar", "notes": "Notes", - "refresh": "Refresh button", - "hover": "Display on hover" + "refresh": "Refresh button" }, "font": { "title": "Font",