diff --git a/README.md b/README.md index 38bbbd1a..86237bfe 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ > Mue -[![License](https://img.shields.io/badge/license-BSD%203-blue?style=flat-square)](/LICENSE) [![Discord](https://img.shields.io/discord/659129207208804381?label=discord&color=7289DA&style=flat-square)](https://discord.gg/zv8C9F8) [![Code Size]( https://img.shields.io/github/languages/code-size/mue/mue?color=green&label=size&style=flat-square)]() +[![License](https://img.shields.io/badge/license-BSD%203-blue?style=flat-square)](/LICENSE) [![Discord](https://img.shields.io/discord/659129207208804381?label=discord&color=7289DA&style=flat-square)](https://discord.gg/zv8C9F8) [![Code Size](https://img.shields.io/github/languages/code-size/mue/mue?color=green&label=size&style=flat-square)]()
[![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) diff --git a/src/components/modals/main/marketplace/Items.jsx b/src/components/modals/main/marketplace/Items.jsx index 81afa836..c6637f25 100644 --- a/src/components/modals/main/marketplace/Items.jsx +++ b/src/components/modals/main/marketplace/Items.jsx @@ -7,7 +7,7 @@ export default function Items(props) {
props.toggleFunction(item.name)} key={item.name}> icon
-

{item.display_name ? item.display_name : item.name}

+

{item.display_name || item.name}

{item.author}

diff --git a/src/components/modals/main/marketplace/Lightbox.jsx b/src/components/modals/main/marketplace/Lightbox.jsx index 01286b83..d36071ef 100644 --- a/src/components/modals/main/marketplace/Lightbox.jsx +++ b/src/components/modals/main/marketplace/Lightbox.jsx @@ -4,7 +4,7 @@ export default function Lightbox(props) { return ( <> × - Item + Item screenshot ); } diff --git a/src/components/modals/main/marketplace/sections/Marketplace.jsx b/src/components/modals/main/marketplace/sections/Marketplace.jsx index e89fb449..4d060cfa 100644 --- a/src/components/modals/main/marketplace/sections/Marketplace.jsx +++ b/src/components/modals/main/marketplace/sections/Marketplace.jsx @@ -110,7 +110,10 @@ export default class Marketplace extends React.PureComponent { switch (value) { case 'a-z': items.sort(); - items.reverse(); + // fix sort not working sometimes + if (this.state.sortType === 'z-a') { + items.reverse(); + } break; case 'z-a': items.sort(); @@ -121,10 +124,9 @@ export default class Marketplace extends React.PureComponent { } this.setState({ - items: items + items: items, + sortType: value }); - - this.forceUpdate(); } componentDidMount() { diff --git a/src/components/modals/main/settings/sections/Time.jsx b/src/components/modals/main/settings/sections/Time.jsx index e294ad90..e0f6bf82 100644 --- a/src/components/modals/main/settings/sections/Time.jsx +++ b/src/components/modals/main/settings/sections/Time.jsx @@ -102,7 +102,9 @@ export default class TimeSettings extends React.PureComponent { {timeSettings} - + {this.state.timeType !== 'analogue' ? + + : null }

{time.date.title}

diff --git a/src/components/widgets/time/Clock.jsx b/src/components/widgets/time/Clock.jsx index 7653f1d7..4920933b 100644 --- a/src/components/widgets/time/Clock.jsx +++ b/src/components/widgets/time/Clock.jsx @@ -104,7 +104,9 @@ export default class Clock extends React.PureComponent { } }); - document.querySelector('.clock-container').style.fontSize = `${4 * Number((localStorage.getItem('zoomClock') || 100) / 100)}em`; + if (localStorage.getItem('timeType') !== 'analogue') { + document.querySelector('.clock-container').style.fontSize = `${4 * Number((localStorage.getItem('zoomClock') || 100) / 100)}em`; + } this.startTime(0); }