diff --git a/src/components/modals/main/settings/sections/Message.jsx b/src/components/modals/main/settings/sections/Message.jsx index 297eb919..f4a9e32a 100644 --- a/src/components/modals/main/settings/sections/Message.jsx +++ b/src/components/modals/main/settings/sections/Message.jsx @@ -69,7 +69,7 @@ export default class Message extends PureComponent { switch={true} /> @@ -91,10 +91,11 @@ export default class Message extends PureComponent { this.message(e, true, index)} varient="outlined" + style={{ padding: "0"}} /> diff --git a/src/components/modals/main/settings/sections/overview_skeletons/Clock.jsx b/src/components/modals/main/settings/sections/overview_skeletons/Clock.jsx index 20897075..26ef7a14 100644 --- a/src/components/modals/main/settings/sections/overview_skeletons/Clock.jsx +++ b/src/components/modals/main/settings/sections/overview_skeletons/Clock.jsx @@ -1,3 +1,29 @@ +import { Suspense, lazy } from 'react'; +const Analog = lazy(() => import('react-clock')); + export default function ClockSkeleton() { - return 10:20; + if (localStorage.getItem('timeType') === 'analogue') { + return ( + }> +
+ +
+
+ ); + } else if (localStorage.getItem('timeType') === 'percentageComplete') { + return 68%; + } else if (localStorage.getItem('timeType') === 'verticalClock') { + return ( + +
10
+
23
+
+ ); + } else { + return 10:24; + } } diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx index 679f3e30..5ddc59e1 100644 --- a/src/components/widgets/background/Background.jsx +++ b/src/components/widgets/background/Background.jsx @@ -401,14 +401,14 @@ export default class Background extends PureComponent { this.interval = setInterval(() => { const targetTime = Number( Number(localStorage.getItem('backgroundStartTime')) + - Number(localStorage.getItem('backgroundchange')), + Number(test), ); const currentTime = Number(Date.now()); const type = localStorage.getItem('backgroundType'); - if (test !== null) { + if (test !== null && test !== 'refresh') { if (currentTime >= targetTime) { - console.log('Is this true?'); + element.classList.remove('fade-in'); this.getBackground(); localStorage.setItem('backgroundStartTime', Date.now()); } else { @@ -419,7 +419,6 @@ export default class Background extends PureComponent { } const offline = localStorage.getItem('offlineMode'); if (current.url.startsWith('http') && offline === 'false') { - console.log('current.url one?'); if (this.state.firstTime !== true) { this.setState(current); } diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json index fa882b7e..053f5869 100644 --- a/src/translations/de_DE.json +++ b/src/translations/de_DE.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Text", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Erscheinungsbild", diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json index 0883d865..7d788967 100644 --- a/src/translations/en_GB.json +++ b/src/translations/en_GB.json @@ -307,7 +307,8 @@ "messages": "Messages", "text": "Text", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Appearance", diff --git a/src/translations/en_US.json b/src/translations/en_US.json index 9fba412d..3f7b6e19 100644 --- a/src/translations/en_US.json +++ b/src/translations/en_US.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Text", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Appearance", diff --git a/src/translations/es.json b/src/translations/es.json index 59678c88..5e955ed4 100644 --- a/src/translations/es.json +++ b/src/translations/es.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Texto", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Apariencia", diff --git a/src/translations/fr.json b/src/translations/fr.json index 78627731..9197e437 100644 --- a/src/translations/fr.json +++ b/src/translations/fr.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Text", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Apparence", diff --git a/src/translations/id_ID.json b/src/translations/id_ID.json index 93e9dc71..dd213251 100644 --- a/src/translations/id_ID.json +++ b/src/translations/id_ID.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Teks", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Antarmuka", diff --git a/src/translations/nl.json b/src/translations/nl.json index eba280ca..3c35f58d 100644 --- a/src/translations/nl.json +++ b/src/translations/nl.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Text", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Appearance", diff --git a/src/translations/no.json b/src/translations/no.json index 57c1b0f1..e4af5d95 100644 --- a/src/translations/no.json +++ b/src/translations/no.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Text", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Appearance", diff --git a/src/translations/ru.json b/src/translations/ru.json index 6b9face5..d5ba401e 100644 --- a/src/translations/ru.json +++ b/src/translations/ru.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "Text", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Appearance", diff --git a/src/translations/tr_TR.json b/src/translations/tr_TR.json index 0e45c234..ecfe3e13 100644 --- a/src/translations/tr_TR.json +++ b/src/translations/tr_TR.json @@ -313,7 +313,8 @@ "messages": "Mesajlar", "text": "Metin", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "Görünüm", diff --git a/src/translations/zh_CN.json b/src/translations/zh_CN.json index 0e740f8a..badd26a4 100644 --- a/src/translations/zh_CN.json +++ b/src/translations/zh_CN.json @@ -313,7 +313,8 @@ "messages": "Messages", "text": "文本", "no_messages": "No messages", - "add_some": "Go ahead and add some." + "add_some": "Go ahead and add some.", + "content": "Message Content" }, "appearance": { "title": "外观",