diff --git a/README.md b/README.md index c1826301..5f4b8c41 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@
[![Microsoft Edge](https://img.shields.io/badge/dynamic/json?style=flat-square&label=microsoft%20edge&query=%24.version&url=https%3A%2F%2Fmicrosoftedge.microsoft.com%2Faddons%2Fgetproductdetailsbycrxid%2Faepnglgjfokepefimhbnibfjekidhmja)](https://microsoftedge.microsoft.com/addons/detail/aepnglgjfokepefimhbnibfjekidhmja) [![Firefox](https://img.shields.io/amo/v/mue?label=firefox&style=flat-square)](https://addons.mozilla.org/firefox/addon/mue) [![Chrome](https://img.shields.io/chrome-web-store/v/bngmbednanpcfochchhgbkookpiaiaid?label=chrome&style=flat-square)](https://chrome.google.com/webstore/detail/mue/bngmbednanpcfochchhgbkookpiaiaid) -Mue is a fast, open and free-to-use browser extension that gives a new, fresh and customisable tab page to modern browsers +Mue is a fast, open and free-to-use browser extension that gives a new, fresh and customisable tab page to modern browsers.
@@ -92,5 +92,4 @@ Many thanks to the photographers [here](https://api.muetab.com/images/photograph And finally, a big thank you to all the other [contributors](https://github.com/mue/mue/graphs/contributors)! ### Resources [Pexels](https://pexels.com), [Unsplash](https://unsplash.com) - Stock photos used for offline mode
-[Undraw](https://undraw.co) - Welcome modal image
-[Material Icons](https://fonts.google.com/icons?selected=Material+Icons) - Pin icon \ No newline at end of file +[Undraw](https://undraw.co) - Welcome modal images
diff --git a/src/components/modals/main/scss/settings/_buttons.scss b/src/components/modals/main/scss/settings/_buttons.scss index d701e4bc..c265f30b 100644 --- a/src/components/modals/main/scss/settings/_buttons.scss +++ b/src/components/modals/main/scss/settings/_buttons.scss @@ -15,7 +15,6 @@ .reset { @extend %settingsButton; - margin-left: 5px; background-color: map-get($button-colours, 'reset'); border: 2px solid map-get($button-colours, 'reset'); diff --git a/src/components/modals/main/settings/sections/background/Background.jsx b/src/components/modals/main/settings/sections/background/Background.jsx index 247e9df5..9442dfd9 100644 --- a/src/components/modals/main/settings/sections/background/Background.jsx +++ b/src/components/modals/main/settings/sections/background/Background.jsx @@ -158,6 +158,10 @@ export default class BackgroundSettings extends React.PureComponent { case 'colour': backgroundSettings = ; break; default: backgroundSettings = APISettings; break; } + + if (localStorage.getItem('photo_packs') && this.state.backgroundType !== 'custom' && this.state.backgroundType !== 'colour' && this.state.backgroundType !== 'api') { + backgroundSettings = null; + } return ( <> diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx index e19fc81e..36ba6153 100644 --- a/src/components/widgets/background/Background.jsx +++ b/src/components/widgets/background/Background.jsx @@ -349,7 +349,7 @@ export default class Background extends React.PureComponent { } const interval = localStorage.getItem('backgroundchange'); - if (interval && interval !== 'refresh') { + if (interval && interval !== 'refresh' && localStorage.getItem('backgroundType') === 'api') { Interval(() => { try { document.getElementById('backgroundImage').classList.remove('fade-in'); diff --git a/src/components/widgets/quote/Quote.jsx b/src/components/widgets/quote/Quote.jsx index dfd98efd..a9a1f2f2 100644 --- a/src/components/widgets/quote/Quote.jsx +++ b/src/components/widgets/quote/Quote.jsx @@ -224,7 +224,7 @@ export default class Quote extends React.PureComponent { }); const interval = localStorage.getItem('quotechange'); - if (interval && interval !== 'refresh') { + if (interval && interval !== 'refresh' && localStorage.getItem('quoteType') === 'api') { Interval(() => { this.setZoom(); this.getQuote();