diff --git a/.github/CHANGELOG.md b/.github/CHANGELOG.md index 4f2a8ac5..0951ddc0 100644 --- a/.github/CHANGELOG.md +++ b/.github/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## ✨ 2.1.1 Improvements [PR #775](https://github.com/Lissy93/dashy/pull/775) +- Stop status checks when item destroyed + - #767 by @marekful +- Add Elizabeth + non-underground lines to TFL widget + - #766 by @dougaldhub +- Ensure first SSL certificate check finished before second + - #760 by @marekful +- Huge improvment to the way widgets are defined + - #758 by @patrickheeney +- Update APOD widget to use https://apod.as93.net + - #745 by @k073l +- Small docs update + - #741 by @markusdd +- A set of awesome NextCloud widgets + - #740 by @marekful +- Option to show / hide detailed info for StatPing widget + - #714 by @marekful +- Korean translations + - #711 by @boggy-cs +- Small docs update + - #705 by @pablomalo + ## ✨ 2.0.9 Adds Multi-Page Support [PR #685](https://github.com/Lissy93/dashy/pull/685) - Adds Widgets for AdGuard diff --git a/.github/LATEST_CHANGELOG.md b/.github/LATEST_CHANGELOG.md index 9660465e..f22d7381 100644 --- a/.github/LATEST_CHANGELOG.md +++ b/.github/LATEST_CHANGELOG.md @@ -1,2 +1,45 @@ -## ✨ 2.0.9 Adds Multi-Page Support [PR #685](https://github.com/Lissy93/dashy/pull/685) -- Adds Widgets for AdGuard +## ✨ 2.1.1 Improvements [PR #775](https://github.com/Lissy93/dashy/pull/775) + +#### Bug Fixes 🐛 + +- Update APOD widget to use https://apod.as93.net + - #745 by @k073l +- Fixes theme applying bug (#774) + +#### Improvements ⚡️ + +- Stop status checks when item destroyed + - #767 by @marekful +- Ensure first SSL certificate check finished before second + - #760 by @marekful +- Huge improvement to the way widgets are defined + - #758 by @patrickheeney + +#### Features ✨ + +- A set of awesome NextCloud widgets + - #740 by @marekful +- Add Elizabeth + non-underground lines to TFL widget + - #766 by @dougaldhub +- Option to show / hide detailed info for StatPing widget + - #714 by @marekful +- Korean translations + - #711 by @boggy-cs +- Adds option to force ignore widget errors + +#### Docs 📕 + +- Small docs update + - #741 by @markusdd +- Small docs update + - #705 by @pablomalo +- Adds Dipanghosh's dash to showcase + +--- + + +Big thanks to the above developers, for their awesome work on this release! + +V 2.1.2 is in the works, and includes an overhaul of how the config is loaded, so stay tuned for that! + +And Happy Friday! diff --git a/docs/showcase.md b/docs/showcase.md index a902a28c..dc4ebfdf 100644 --- a/docs/showcase.md +++ b/docs/showcase.md @@ -9,6 +9,17 @@ --- +### Dipan's Dash + +> By [@Dipanghosh](https://github.com/dipanghosh) - [dipan.de](https://dipan.de/) Re: [#777](https://github.com/Lissy93/dashy/discussions/777) + +> With the option of embedding iframes, it becomes possible to combine and conquer. I have set up Dashy to include graphs from grafana, and set them so that they update automatically. I also have uptime monitors from uptime Kuma, panels from homeasistant are also possible to be included.
+> Dashy is awesome! + +![screenshot-dipanghosh-dashboard](https://i.ibb.co/bPC6w2n/dipanghosh-dashboard.png) + +--- + ### Ratty222 > By [@ratty222](https://github.com/ratty222) Re: [#384](https://github.com/Lissy93/dashy/discussions/384) @@ -38,11 +49,13 @@ --- -### The Private Dashboard -> By [@DylanBeMe](https://github.com/DylanBeMe) Re: [#419](https://github.com/Lissy93/dashy/issues/419) +### The Dragons Lair +> By [dr460nf1r3](https://github.com/dr460nf1r3) via [#684](https://github.com/Lissy93/dashy/issues/684) -![screenshot-private-dashboard](https://i.ibb.co/hKS483T/private-dashboard-Dylan-Be-Me.png) +> My new startpage featuring the stuff I use most. And of course dragons! + +![screenshot-dragons-lair](https://raw.githubusercontent.com/Lissy93/dashy/master/docs/showcase/13-dragons-lair.png) --- @@ -78,6 +91,14 @@ --- +### The Private Dashboard + +> By [@DylanBeMe](https://github.com/DylanBeMe) Re: [#419](https://github.com/Lissy93/dashy/issues/419) + +![screenshot-private-dashboard](https://i.ibb.co/hKS483T/private-dashboard-Dylan-Be-Me.png) + +--- + ### Networking Services > By [@Lissy93](https://github.com/lissy93) @@ -185,15 +206,6 @@ --- -### The Dragons Lair -> By [dr460nf1r3](https://github.com/dr460nf1r3) via [#684](https://github.com/Lissy93/dashy/issues/684) - -> My new startpage featuring the stuff I use most. And of course dragons! - -![screenshot-dragons-lair](https://raw.githubusercontent.com/Lissy93/dashy/master/docs/showcase/13-dragons-lair.png) - ---- - ## Submitting your Dashboard #### How to Submit diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index d464a919..091d07c1 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -3,7 +3,7 @@ > _**This document contains common problems and their solutions.**_
> Please ensure your issue isn't listed here, before opening a new ticket. > -> _If you come across an issue not listed below, consider adding it, to help other users._ +> _Found something not listed here? Consider adding it, to help other users._ ### Contents - [Refused to Connect in Web Content View](#refused-to-connect-in-modal-or-workspace-view) @@ -30,10 +30,12 @@ - [Status Checks Failing](#status-checks-failing) - [Diagnosing Widget Errors](#widget-errors) - [Fixing Widget CORS Errors](#widget-cors-errors) +- [Widget Shows Error Incorrectly](#widget-shows-error-incorrectly) - [Weather Forecast Widget 401](#weather-forecast-widget-401) - [Font Awesome Icons not Displaying](#font-awesome-icons-not-displaying) - [Copy to Clipboard not Working](#copy-to-clipboard-not-working) - [How to Reset Local Settings](#how-to-reset-local-settings) +- [How to make a bug report](#how-to-make-a-bug-report) - [How-To Open Browser Console](#how-to-open-browser-console) - [Git Contributions not Displaying](#git-contributions-not-displaying) @@ -421,6 +423,15 @@ For testing purposes, you can use an addon, which will disable the CORS checks. --- +## Widget Shows Error Incorrectly + +When there's an error fetching or displaying a widgets data, then it will be highlighted in yellow, and a message displayed on the UI. + +In some instances, this is a false positive, and the widget is actually functioning correctly. +If this is the case, you can disable the UI error message of a given widget by setting: `ignoreErrors: true` + +--- + ## Weather Forecast Widget 401 [Weather widget](/docs/widgets.md#weather-forecast) is working fine, but you are getting a `401` for the [Weather Forecast widget](/docs/widgets.md#weather-forecast), then this is most likely an OWM API key issue. @@ -473,6 +484,47 @@ For a full list of all data that may be cached, see the [Privacy Docs](/docs/pri --- +## How to make a bug report + +#### Step 1 - Where to open issues + +You will need a GitHub account in order to raise a ticket. You can then [click here](https://github.com/Lissy93/dashy/issues/new?assignees=lissy93&labels=%F0%9F%90%9B+Bug&template=bug.yml&title=%5BBUG%5D+%3Ctitle%3E) to open a new bug report. + +#### Step 2 - Checking it's not already covered + +Before submitting, please check that: +- A similar ticket has not previously been opened +- The issue is not covered in the [troubleshooting guide](https://github.com/Lissy93/dashy/blob/master/docs/troubleshooting.md) or [docs](https://github.com/Lissy93/dashy/tree/master/docs#readme) + +#### Step 3 - Describe the Issue + +Your ticket will likely be dealt with more effectively if you can explain the issue clearly, and provide all relevant supporting material. + +Complete the fields, asking for your environment info and version of Dashy. +Then describe the issue, briefly explaining the steps to reproduce, expected outcome and actual outcome. + +#### Step 4 - Provide Supporting Info + +Where relevant please also include: + +- A screenshot of the issue +- The relevant parts of your config file +- Logs + - If client-side issue, then include the browser logs ([see how](#how-to-open-browser-console)) + - If server-side / during deployment, include the terminal output + +_Take care to redact any personal info, (like IP addresses, auth hashes or API keys)_ + +#### Step 5 - Fix Released + +A maintainer will aim to respond within 48 hours. +The timeframe for resolving your issue, will vary depending on severity of the bug and the complexity of the fix. +You will be notified on your ticket, when a fix has been released. + +Finally, be sure to remain respectful to other users and project maintainers, in line with the [Contributor Covenant Code of Conduct](https://github.com/Lissy93/dashy/blob/master/.github/CODE_OF_CONDUCT.md#contributor-covenant-code-of-conduct). + +--- + ## How-To Open Browser Console When raising a bug, one crucial piece of info needed is the browser's console output. This will help the developer diagnose and fix the issue. diff --git a/docs/widgets.md b/docs/widgets.md index 1bbd9e65..11557f77 100644 --- a/docs/widgets.md +++ b/docs/widgets.md @@ -80,6 +80,7 @@ Dashy has support for displaying dynamic content in the form of widgets. There a - [Continuous Updates](#continuous-updates) - [Proxying Requests](#proxying-requests) - [Setting Timeout](#setting-timeout) + - [Ignoring Errors](#ignoring-errors) - [Custom CSS Styling](#widget-styling) - [Customizing Charts](#customizing-charts) - [Language Translations](#language-translations) @@ -2264,6 +2265,21 @@ For example: --- +### Ignoring Errors + +When there's an error fetching or displaying a widgets data, then it will be highlighted in yellow, and a message displayed on the UI. + +In some instances, this is a false positive, and the widget is actually functioning correctly. If this is the case, you can disable the UI error message of a given widget by setting: `ignoreErrors: true` + +```yaml +- type: gl-disk-io + ignoreErrors: true + options: + hostname: https://glances.dns-device.local +``` + +--- + ### Widget Styling Like elsewhere in Dashy, all colours can be easily modified with CSS variables. diff --git a/package.json b/package.json index 64f6d7d0..7beb9df3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Dashy", - "version": "2.1.0", + "version": "2.1.1", "license": "MIT", "main": "server", "author": "Alicia Sykes (https://aliciasykes.com)", diff --git a/public/manifest.json b/public/manifest.json index a0447af2..aa9afea8 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -11,546 +11,28 @@ "orientation": "portrait-primary", "icons": [ { - "src": "./web-icons/windows10/SmallTile.scale-100.png", - "sizes": "71x71" - }, - { - "src": "./web-icons/windows10/SmallTile.scale-125.png", - "sizes": "89x89" - }, - { - "src": "./web-icons/windows10/SmallTile.scale-150.png", - "sizes": "107x107" - }, - { - "src": "./web-icons/windows10/SmallTile.scale-200.png", - "sizes": "142x142" - }, - { - "src": "./web-icons/windows10/SmallTile.scale-400.png", - "sizes": "284x284" - }, - { - "src": "./web-icons/windows10/Square150x150Logo.scale-100.png", - "sizes": "150x150" - }, - { - "src": "./web-icons/windows10/Square150x150Logo.scale-125.png", - "sizes": "188x188" - }, - { - "src": "./web-icons/windows10/Square150x150Logo.scale-150.png", - "sizes": "225x225" - }, - { - "src": "./web-icons/windows10/Square150x150Logo.scale-200.png", - "sizes": "300x300" - }, - { - "src": "./web-icons/windows10/Square150x150Logo.scale-400.png", - "sizes": "600x600" - }, - { - "src": "./web-icons/windows10/Wide310x150Logo.scale-100.png", - "sizes": "310x150" - }, - { - "src": "./web-icons/windows10/Wide310x150Logo.scale-125.png", - "sizes": "388x188" - }, - { - "src": "./web-icons/windows10/Wide310x150Logo.scale-150.png", - "sizes": "465x225" - }, - { - "src": "./web-icons/windows10/Wide310x150Logo.scale-200.png", - "sizes": "620x300" - }, - { - "src": "./web-icons/windows10/Wide310x150Logo.scale-400.png", - "sizes": "1240x600" - }, - { - "src": "./web-icons/windows10/LargeTile.scale-100.png", - "sizes": "310x310" - }, - { - "src": "./web-icons/windows10/LargeTile.scale-125.png", - "sizes": "388x388" - }, - { - "src": "./web-icons/windows10/LargeTile.scale-150.png", - "sizes": "465x465" - }, - { - "src": "./web-icons/windows10/LargeTile.scale-200.png", - "sizes": "620x620" - }, - { - "src": "./web-icons/windows10/LargeTile.scale-400.png", - "sizes": "1240x1240" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.scale-100.png", - "sizes": "44x44" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.scale-125.png", - "sizes": "55x55" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.scale-150.png", - "sizes": "66x66" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.scale-200.png", - "sizes": "88x88" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.scale-400.png", - "sizes": "176x176" - }, - { - "src": "./web-icons/windows10/StoreLogo.scale-100.png", - "sizes": "50x50" - }, - { - "src": "./web-icons/windows10/StoreLogo.scale-125.png", - "sizes": "63x63" - }, - { - "src": "./web-icons/windows10/StoreLogo.scale-150.png", - "sizes": "75x75" - }, - { - "src": "./web-icons/windows10/StoreLogo.scale-200.png", - "sizes": "100x100" - }, - { - "src": "./web-icons/windows10/StoreLogo.scale-400.png", - "sizes": "200x200" - }, - { - "src": "./web-icons/windows10/SplashScreen.scale-100.png", - "sizes": "620x300" - }, - { - "src": "./web-icons/windows10/SplashScreen.scale-125.png", - "sizes": "775x375" - }, - { - "src": "./web-icons/windows10/SplashScreen.scale-150.png", - "sizes": "930x450" - }, - { - "src": "./web-icons/windows10/SplashScreen.scale-200.png", - "sizes": "1240x600" - }, - { - "src": "./web-icons/windows10/SplashScreen.scale-400.png", - "sizes": "2480x1200" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-16.png", - "sizes": "16x16" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-20.png", - "sizes": "20x20" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-24.png", - "sizes": "24x24" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-30.png", - "sizes": "30x30" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-32.png", - "sizes": "32x32" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-36.png", - "sizes": "36x36" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-40.png", - "sizes": "40x40" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-44.png", - "sizes": "44x44" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-48.png", - "sizes": "48x48" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-60.png", - "sizes": "60x60" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-64.png", - "sizes": "64x64" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-72.png", - "sizes": "72x72" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-80.png", - "sizes": "80x80" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-96.png", - "sizes": "96x96" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.targetsize-256.png", - "sizes": "256x256" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-16.png", - "sizes": "16x16" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-20.png", - "sizes": "20x20" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-24.png", - "sizes": "24x24" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-30.png", - "sizes": "30x30" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-32.png", - "sizes": "32x32" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-36.png", - "sizes": "36x36" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-40.png", - "sizes": "40x40" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-44.png", - "sizes": "44x44" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-48.png", - "sizes": "48x48" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-60.png", - "sizes": "60x60" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-64.png", - "sizes": "64x64" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-72.png", - "sizes": "72x72" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-80.png", - "sizes": "80x80" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-96.png", - "sizes": "96x96" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-256.png", - "sizes": "256x256" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-16.png", - "sizes": "16x16" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-20.png", - "sizes": "20x20" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-24.png", - "sizes": "24x24" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-30.png", - "sizes": "30x30" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-32.png", - "sizes": "32x32" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-36.png", - "sizes": "36x36" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-40.png", - "sizes": "40x40" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-44.png", - "sizes": "44x44" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-48.png", - "sizes": "48x48" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-60.png", - "sizes": "60x60" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-64.png", - "sizes": "64x64" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-72.png", - "sizes": "72x72" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-80.png", - "sizes": "80x80" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-96.png", - "sizes": "96x96" - }, - { - "src": "./web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-256.png", - "sizes": "256x256" - }, - { - "src": "./web-icons/windows/windows-smallsquare-24-24.png", - "sizes": "24x24" - }, - { - "src": "./web-icons/windows/windows-smallsquare-30-30.png", - "sizes": "30x30" - }, - { - "src": "./web-icons/windows/windows-smallsquare-42-42.png", - "sizes": "42x42" - }, - { - "src": "./web-icons/windows/windows-smallsquare-54-54.png", - "sizes": "54x54" - }, - { - "src": "./web-icons/windows/windows-splashscreen-1116-540.png", - "sizes": "1116x540" - }, - { - "src": "./web-icons/windows/windows-splashscreen-868-420.png", - "sizes": "868x420" - }, - { - "src": "./web-icons/windows/windows-splashscreen-620-300.png", - "sizes": "620x300" - }, - { - "src": "./web-icons/windows/windows-squarelogo-270-270.png", - "sizes": "270x270" - }, - { - "src": "./web-icons/windows/windows-squarelogo-210-210.png", - "sizes": "210x210" - }, - { - "src": "./web-icons/windows/windows-squarelogo-150-150.png", - "sizes": "150x150" - }, - { - "src": "./web-icons/windows/windows-squarelogo-120-120.png", - "sizes": "120x120" - }, - { - "src": "./web-icons/windows/windows-storelogo-90-90.png", - "sizes": "90x90" - }, - { - "src": "./web-icons/windows/windows-storelogo-70-70.png", - "sizes": "70x70" - }, - { - "src": "./web-icons/windows/windows-storelogo-50-50.png", - "sizes": "50x50" - }, - { - "src": "./web-icons/windows/windowsphone-appicon-106-106.png", - "sizes": "106x106" - }, - { - "src": "./web-icons/windows/windowsphone-appicon-62-62.png", - "sizes": "62x62" - }, - { - "src": "./web-icons/windows/windowsphone-appicon-44-44.png", - "sizes": "44x44" - }, - { - "src": "./web-icons/windows/windowsphone-mediumtile-360-360.png", - "sizes": "360x360" - }, - { - "src": "./web-icons/windows/windowsphone-mediumtile-210-210.png", - "sizes": "210x210" - }, - { - "src": "./web-icons/windows/windowsphone-mediumtile-150-150.png", - "sizes": "150x150" - }, - { - "src": "./web-icons/windows/windowsphone-smalltile-170-170.png", - "sizes": "170x170" - }, - { - "src": "./web-icons/windows/windowsphone-smalltile-99-99.png", - "sizes": "99x99" - }, - { - "src": "./web-icons/windows/windowsphone-smalltile-71-71.png", - "sizes": "71x71" - }, - { - "src": "./web-icons/windows/windowsphone-storelogo-120-120.png", - "sizes": "120x120" - }, - { - "src": "./web-icons/windows/windowsphone-storelogo-70-70.png", - "sizes": "70x70" - }, - { - "src": "./web-icons/windows/windowsphone-storelogo-50-50.png", - "sizes": "50x50" - }, - { - "src": "./web-icons/msteams/msteams-192-192.png", - "sizes": "192x192" - }, - { - "src": "./web-icons/msteams/msteams-silhouette-32-32.png", - "sizes": "32x32" - }, - { - "src": "./web-icons/android/android-launchericon-512-512.png", + "src": "./web-icons/dashy-pwa_512x512.png", "sizes": "512x512" }, { - "src": "./web-icons/android/android-launchericon-192-192.png", + "src": "./web-icons/dashy-pwa_192x192.png", "sizes": "192x192" }, { - "src": "./web-icons/android/android-launchericon-144-144.png", + "src": "./web-icons/dashy-pwa_144x144.png", "sizes": "144x144" }, { - "src": "./web-icons/android/android-launchericon-96-96.png", + "src": "./web-icons/dashy-pwa_96x96.png", "sizes": "96x96" }, { - "src": "./web-icons/android/android-launchericon-72-72.png", + "src": "./web-icons/dashy-pwa_72x72.png", "sizes": "72x72" }, { - "src": "./web-icons/android/android-launchericon-48-48.png", + "src": "./web-icons/dashy-pwa_48x48.png", "sizes": "48x48" - }, - { - "src": "./web-icons/chrome/chrome-extensionmanagementpage-48-48.png", - "sizes": "48x48" - }, - { - "src": "./web-icons/chrome/chrome-favicon-16-16.png", - "sizes": "16x16" - }, - { - "src": "./web-icons/chrome/chrome-installprocess-128-128.png", - "sizes": "128x128" - }, - { - "src": "./web-icons/firefox/firefox-marketplace-512-512.png", - "sizes": "512x512" - }, - { - "src": "./web-icons/firefox/firefox-marketplace-128-128.png", - "sizes": "128x128" - }, - { - "src": "./web-icons/firefox/firefox-general-256-256.png", - "sizes": "256x256" - }, - { - "src": "./web-icons/firefox/firefox-general-128-128.png", - "sizes": "128x128" - }, - { - "src": "./web-icons/firefox/firefox-general-90-90.png", - "sizes": "90x90" - }, - { - "src": "./web-icons/firefox/firefox-general-64-64.png", - "sizes": "64x64" - }, - { - "src": "./web-icons/firefox/firefox-general-48-48.png", - "sizes": "48x48" - }, - { - "src": "./web-icons/firefox/firefox-general-32-32.png", - "sizes": "32x32" - }, - { - "src": "./web-icons/firefox/firefox-general-16-16.png", - "sizes": "16x16" - } - ], - "screenshots": [ - { - "src": "./web-icons/screenshots/dashy-scrsht-1.png", - "sizes": "1523x1347", - "type": "image/png", - "label": "Dashy example homelab with Callisto theme" - }, - { - "src": "./web-icons/screenshots/dashy-scrsht-2.png", - "sizes": "1264x861", - "type": "image/png", - "label": "Example, Networking services with Minimal Dark theme and a Horizontal layout" - }, - { - "src": "./web-icons/screenshots/dashy-scrsht-3.png", - "sizes": "1303x864", - "type": "image/png", - "label": "Dashy example homelab with Material theme and auto-fetched favicons" - }, - { - "src": "./web-icons/screenshots/dashy-scrsht-4.png", - "sizes": "1273x865", - "type": "image/png", - "label": "Dashy CFT Toolbox using Matrix theme" - }, - { - "src": "./web-icons/screenshots/dashy-scrsht-5.png", - "sizes": "1146x851", - "type": "image/png", - "label": "Dashy as a Bookmark Manager, with Dracula theme and Font-Awesome icons" - }, - { - "src": "./web-icons/screenshots/dashy-scrsht-6.png", - "sizes": "1147x872", - "type": "image/png", - "label": "Dashy example homelab with Nord theme" } ] -} \ No newline at end of file +} diff --git a/public/web-icons/chrome/chrome-extensionmanagementpage-48-48.png b/public/web-icons/chrome/chrome-extensionmanagementpage-48-48.png deleted file mode 100644 index 4dc7ee3b..00000000 Binary files a/public/web-icons/chrome/chrome-extensionmanagementpage-48-48.png and /dev/null differ diff --git a/public/web-icons/chrome/chrome-favicon-16-16.png b/public/web-icons/chrome/chrome-favicon-16-16.png deleted file mode 100644 index 23b915d9..00000000 Binary files a/public/web-icons/chrome/chrome-favicon-16-16.png and /dev/null differ diff --git a/public/web-icons/chrome/chrome-installprocess-128-128.png b/public/web-icons/chrome/chrome-installprocess-128-128.png deleted file mode 100644 index 1e6bbe63..00000000 Binary files a/public/web-icons/chrome/chrome-installprocess-128-128.png and /dev/null differ diff --git a/public/web-icons/android/android-launchericon-144-144.png b/public/web-icons/dashy-pwa_144x144.png similarity index 100% rename from public/web-icons/android/android-launchericon-144-144.png rename to public/web-icons/dashy-pwa_144x144.png diff --git a/public/web-icons/android/android-launchericon-192-192.png b/public/web-icons/dashy-pwa_192x192.png similarity index 100% rename from public/web-icons/android/android-launchericon-192-192.png rename to public/web-icons/dashy-pwa_192x192.png diff --git a/public/web-icons/android/android-launchericon-48-48.png b/public/web-icons/dashy-pwa_48x48.png similarity index 100% rename from public/web-icons/android/android-launchericon-48-48.png rename to public/web-icons/dashy-pwa_48x48.png diff --git a/public/web-icons/android/android-launchericon-512-512.png b/public/web-icons/dashy-pwa_512x512.png similarity index 100% rename from public/web-icons/android/android-launchericon-512-512.png rename to public/web-icons/dashy-pwa_512x512.png diff --git a/public/web-icons/android/android-launchericon-72-72.png b/public/web-icons/dashy-pwa_72x72.png similarity index 100% rename from public/web-icons/android/android-launchericon-72-72.png rename to public/web-icons/dashy-pwa_72x72.png diff --git a/public/web-icons/android/android-launchericon-96-96.png b/public/web-icons/dashy-pwa_96x96.png similarity index 100% rename from public/web-icons/android/android-launchericon-96-96.png rename to public/web-icons/dashy-pwa_96x96.png diff --git a/public/web-icons/firefox/firefox-general-128-128.png b/public/web-icons/firefox/firefox-general-128-128.png deleted file mode 100644 index 1e6bbe63..00000000 Binary files a/public/web-icons/firefox/firefox-general-128-128.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-general-16-16.png b/public/web-icons/firefox/firefox-general-16-16.png deleted file mode 100644 index 23b915d9..00000000 Binary files a/public/web-icons/firefox/firefox-general-16-16.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-general-256-256.png b/public/web-icons/firefox/firefox-general-256-256.png deleted file mode 100644 index caac55ce..00000000 Binary files a/public/web-icons/firefox/firefox-general-256-256.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-general-32-32.png b/public/web-icons/firefox/firefox-general-32-32.png deleted file mode 100644 index 261795a4..00000000 Binary files a/public/web-icons/firefox/firefox-general-32-32.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-general-48-48.png b/public/web-icons/firefox/firefox-general-48-48.png deleted file mode 100644 index 4dc7ee3b..00000000 Binary files a/public/web-icons/firefox/firefox-general-48-48.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-general-64-64.png b/public/web-icons/firefox/firefox-general-64-64.png deleted file mode 100644 index 79e2cfb6..00000000 Binary files a/public/web-icons/firefox/firefox-general-64-64.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-general-90-90.png b/public/web-icons/firefox/firefox-general-90-90.png deleted file mode 100644 index fc53dd3c..00000000 Binary files a/public/web-icons/firefox/firefox-general-90-90.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-marketplace-128-128.png b/public/web-icons/firefox/firefox-marketplace-128-128.png deleted file mode 100644 index 1e6bbe63..00000000 Binary files a/public/web-icons/firefox/firefox-marketplace-128-128.png and /dev/null differ diff --git a/public/web-icons/firefox/firefox-marketplace-512-512.png b/public/web-icons/firefox/firefox-marketplace-512-512.png deleted file mode 100644 index 8ef4f6a4..00000000 Binary files a/public/web-icons/firefox/firefox-marketplace-512-512.png and /dev/null differ diff --git a/public/web-icons/msteams/msteams-192-192.png b/public/web-icons/msteams/msteams-192-192.png deleted file mode 100644 index 7d2f5c69..00000000 Binary files a/public/web-icons/msteams/msteams-192-192.png and /dev/null differ diff --git a/public/web-icons/msteams/msteams-silhouette-32-32.png b/public/web-icons/msteams/msteams-silhouette-32-32.png deleted file mode 100644 index 261795a4..00000000 Binary files a/public/web-icons/msteams/msteams-silhouette-32-32.png and /dev/null differ diff --git a/public/web-icons/screenshots/dashy-scrsht-1.png b/public/web-icons/screenshots/dashy-scrsht-1.png deleted file mode 100644 index d5f3cd3f..00000000 Binary files a/public/web-icons/screenshots/dashy-scrsht-1.png and /dev/null differ diff --git a/public/web-icons/screenshots/dashy-scrsht-2.png b/public/web-icons/screenshots/dashy-scrsht-2.png deleted file mode 100644 index bfaab618..00000000 Binary files a/public/web-icons/screenshots/dashy-scrsht-2.png and /dev/null differ diff --git a/public/web-icons/screenshots/dashy-scrsht-3.png b/public/web-icons/screenshots/dashy-scrsht-3.png deleted file mode 100644 index 605a520c..00000000 Binary files a/public/web-icons/screenshots/dashy-scrsht-3.png and /dev/null differ diff --git a/public/web-icons/screenshots/dashy-scrsht-4.png b/public/web-icons/screenshots/dashy-scrsht-4.png deleted file mode 100644 index a728a8a9..00000000 Binary files a/public/web-icons/screenshots/dashy-scrsht-4.png and /dev/null differ diff --git a/public/web-icons/screenshots/dashy-scrsht-5.png b/public/web-icons/screenshots/dashy-scrsht-5.png deleted file mode 100644 index 9a61a2dc..00000000 Binary files a/public/web-icons/screenshots/dashy-scrsht-5.png and /dev/null differ diff --git a/public/web-icons/screenshots/dashy-scrsht-6.png b/public/web-icons/screenshots/dashy-scrsht-6.png deleted file mode 100644 index 8402f0a1..00000000 Binary files a/public/web-icons/screenshots/dashy-scrsht-6.png and /dev/null differ diff --git a/public/web-icons/windows/windows-smallsquare-24-24.png b/public/web-icons/windows/windows-smallsquare-24-24.png deleted file mode 100644 index 5b0ed288..00000000 Binary files a/public/web-icons/windows/windows-smallsquare-24-24.png and /dev/null differ diff --git a/public/web-icons/windows/windows-smallsquare-30-30.png b/public/web-icons/windows/windows-smallsquare-30-30.png deleted file mode 100644 index ab35d8a3..00000000 Binary files a/public/web-icons/windows/windows-smallsquare-30-30.png and /dev/null differ diff --git a/public/web-icons/windows/windows-smallsquare-42-42.png b/public/web-icons/windows/windows-smallsquare-42-42.png deleted file mode 100644 index f98ecb16..00000000 Binary files a/public/web-icons/windows/windows-smallsquare-42-42.png and /dev/null differ diff --git a/public/web-icons/windows/windows-smallsquare-54-54.png b/public/web-icons/windows/windows-smallsquare-54-54.png deleted file mode 100644 index 353062f1..00000000 Binary files a/public/web-icons/windows/windows-smallsquare-54-54.png and /dev/null differ diff --git a/public/web-icons/windows/windows-splashscreen-1116-540.png b/public/web-icons/windows/windows-splashscreen-1116-540.png deleted file mode 100644 index 8d672992..00000000 Binary files a/public/web-icons/windows/windows-splashscreen-1116-540.png and /dev/null differ diff --git a/public/web-icons/windows/windows-splashscreen-620-300.png b/public/web-icons/windows/windows-splashscreen-620-300.png deleted file mode 100644 index c2e4afe6..00000000 Binary files a/public/web-icons/windows/windows-splashscreen-620-300.png and /dev/null differ diff --git a/public/web-icons/windows/windows-splashscreen-868-420.png b/public/web-icons/windows/windows-splashscreen-868-420.png deleted file mode 100644 index e4b2f81c..00000000 Binary files a/public/web-icons/windows/windows-splashscreen-868-420.png and /dev/null differ diff --git a/public/web-icons/windows/windows-squarelogo-120-120.png b/public/web-icons/windows/windows-squarelogo-120-120.png deleted file mode 100644 index c84fee21..00000000 Binary files a/public/web-icons/windows/windows-squarelogo-120-120.png and /dev/null differ diff --git a/public/web-icons/windows/windows-squarelogo-150-150.png b/public/web-icons/windows/windows-squarelogo-150-150.png deleted file mode 100644 index ddad8feb..00000000 Binary files a/public/web-icons/windows/windows-squarelogo-150-150.png and /dev/null differ diff --git a/public/web-icons/windows/windows-squarelogo-210-210.png b/public/web-icons/windows/windows-squarelogo-210-210.png deleted file mode 100644 index 7cb0e6ff..00000000 Binary files a/public/web-icons/windows/windows-squarelogo-210-210.png and /dev/null differ diff --git a/public/web-icons/windows/windows-squarelogo-270-270.png b/public/web-icons/windows/windows-squarelogo-270-270.png deleted file mode 100644 index f1e5cb71..00000000 Binary files a/public/web-icons/windows/windows-squarelogo-270-270.png and /dev/null differ diff --git a/public/web-icons/windows/windows-storelogo-50-50.png b/public/web-icons/windows/windows-storelogo-50-50.png deleted file mode 100644 index e1b97cf8..00000000 Binary files a/public/web-icons/windows/windows-storelogo-50-50.png and /dev/null differ diff --git a/public/web-icons/windows/windows-storelogo-70-70.png b/public/web-icons/windows/windows-storelogo-70-70.png deleted file mode 100644 index e0c2761b..00000000 Binary files a/public/web-icons/windows/windows-storelogo-70-70.png and /dev/null differ diff --git a/public/web-icons/windows/windows-storelogo-90-90.png b/public/web-icons/windows/windows-storelogo-90-90.png deleted file mode 100644 index fc53dd3c..00000000 Binary files a/public/web-icons/windows/windows-storelogo-90-90.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-appicon-106-106.png b/public/web-icons/windows/windowsphone-appicon-106-106.png deleted file mode 100644 index cdc79c79..00000000 Binary files a/public/web-icons/windows/windowsphone-appicon-106-106.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-appicon-44-44.png b/public/web-icons/windows/windowsphone-appicon-44-44.png deleted file mode 100644 index 3e475fcb..00000000 Binary files a/public/web-icons/windows/windowsphone-appicon-44-44.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-appicon-62-62.png b/public/web-icons/windows/windowsphone-appicon-62-62.png deleted file mode 100644 index 13f3a8d8..00000000 Binary files a/public/web-icons/windows/windowsphone-appicon-62-62.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-mediumtile-150-150.png b/public/web-icons/windows/windowsphone-mediumtile-150-150.png deleted file mode 100644 index ddad8feb..00000000 Binary files a/public/web-icons/windows/windowsphone-mediumtile-150-150.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-mediumtile-210-210.png b/public/web-icons/windows/windowsphone-mediumtile-210-210.png deleted file mode 100644 index 7cb0e6ff..00000000 Binary files a/public/web-icons/windows/windowsphone-mediumtile-210-210.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-mediumtile-360-360.png b/public/web-icons/windows/windowsphone-mediumtile-360-360.png deleted file mode 100644 index 16996490..00000000 Binary files a/public/web-icons/windows/windowsphone-mediumtile-360-360.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-smalltile-170-170.png b/public/web-icons/windows/windowsphone-smalltile-170-170.png deleted file mode 100644 index 10fbd2e6..00000000 Binary files a/public/web-icons/windows/windowsphone-smalltile-170-170.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-smalltile-71-71.png b/public/web-icons/windows/windowsphone-smalltile-71-71.png deleted file mode 100644 index 196257f3..00000000 Binary files a/public/web-icons/windows/windowsphone-smalltile-71-71.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-smalltile-99-99.png b/public/web-icons/windows/windowsphone-smalltile-99-99.png deleted file mode 100644 index 7eeb208d..00000000 Binary files a/public/web-icons/windows/windowsphone-smalltile-99-99.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-storelogo-120-120.png b/public/web-icons/windows/windowsphone-storelogo-120-120.png deleted file mode 100644 index c84fee21..00000000 Binary files a/public/web-icons/windows/windowsphone-storelogo-120-120.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-storelogo-50-50.png b/public/web-icons/windows/windowsphone-storelogo-50-50.png deleted file mode 100644 index e1b97cf8..00000000 Binary files a/public/web-icons/windows/windowsphone-storelogo-50-50.png and /dev/null differ diff --git a/public/web-icons/windows/windowsphone-storelogo-70-70.png b/public/web-icons/windows/windowsphone-storelogo-70-70.png deleted file mode 100644 index e0c2761b..00000000 Binary files a/public/web-icons/windows/windowsphone-storelogo-70-70.png and /dev/null differ diff --git a/public/web-icons/windows10/LargeTile.scale-100.png b/public/web-icons/windows10/LargeTile.scale-100.png deleted file mode 100644 index d0cef50d..00000000 Binary files a/public/web-icons/windows10/LargeTile.scale-100.png and /dev/null differ diff --git a/public/web-icons/windows10/LargeTile.scale-125.png b/public/web-icons/windows10/LargeTile.scale-125.png deleted file mode 100644 index 068167a5..00000000 Binary files a/public/web-icons/windows10/LargeTile.scale-125.png and /dev/null differ diff --git a/public/web-icons/windows10/LargeTile.scale-150.png b/public/web-icons/windows10/LargeTile.scale-150.png deleted file mode 100644 index c2d18385..00000000 Binary files a/public/web-icons/windows10/LargeTile.scale-150.png and /dev/null differ diff --git a/public/web-icons/windows10/LargeTile.scale-200.png b/public/web-icons/windows10/LargeTile.scale-200.png deleted file mode 100644 index 75eb7e0f..00000000 Binary files a/public/web-icons/windows10/LargeTile.scale-200.png and /dev/null differ diff --git a/public/web-icons/windows10/LargeTile.scale-400.png b/public/web-icons/windows10/LargeTile.scale-400.png deleted file mode 100644 index 7b6be43f..00000000 Binary files a/public/web-icons/windows10/LargeTile.scale-400.png and /dev/null differ diff --git a/public/web-icons/windows10/SmallTile.scale-100.png b/public/web-icons/windows10/SmallTile.scale-100.png deleted file mode 100644 index 196257f3..00000000 Binary files a/public/web-icons/windows10/SmallTile.scale-100.png and /dev/null differ diff --git a/public/web-icons/windows10/SmallTile.scale-125.png b/public/web-icons/windows10/SmallTile.scale-125.png deleted file mode 100644 index 963085d3..00000000 Binary files a/public/web-icons/windows10/SmallTile.scale-125.png and /dev/null differ diff --git a/public/web-icons/windows10/SmallTile.scale-150.png b/public/web-icons/windows10/SmallTile.scale-150.png deleted file mode 100644 index b331c8d7..00000000 Binary files a/public/web-icons/windows10/SmallTile.scale-150.png and /dev/null differ diff --git a/public/web-icons/windows10/SmallTile.scale-200.png b/public/web-icons/windows10/SmallTile.scale-200.png deleted file mode 100644 index 3b7aa1ed..00000000 Binary files a/public/web-icons/windows10/SmallTile.scale-200.png and /dev/null differ diff --git a/public/web-icons/windows10/SmallTile.scale-400.png b/public/web-icons/windows10/SmallTile.scale-400.png deleted file mode 100644 index fcfd2732..00000000 Binary files a/public/web-icons/windows10/SmallTile.scale-400.png and /dev/null differ diff --git a/public/web-icons/windows10/SplashScreen.scale-100.png b/public/web-icons/windows10/SplashScreen.scale-100.png deleted file mode 100644 index c2e4afe6..00000000 Binary files a/public/web-icons/windows10/SplashScreen.scale-100.png and /dev/null differ diff --git a/public/web-icons/windows10/SplashScreen.scale-125.png b/public/web-icons/windows10/SplashScreen.scale-125.png deleted file mode 100644 index 4156bd97..00000000 Binary files a/public/web-icons/windows10/SplashScreen.scale-125.png and /dev/null differ diff --git a/public/web-icons/windows10/SplashScreen.scale-150.png b/public/web-icons/windows10/SplashScreen.scale-150.png deleted file mode 100644 index 0399ee89..00000000 Binary files a/public/web-icons/windows10/SplashScreen.scale-150.png and /dev/null differ diff --git a/public/web-icons/windows10/SplashScreen.scale-200.png b/public/web-icons/windows10/SplashScreen.scale-200.png deleted file mode 100644 index 3f0ac575..00000000 Binary files a/public/web-icons/windows10/SplashScreen.scale-200.png and /dev/null differ diff --git a/public/web-icons/windows10/SplashScreen.scale-400.png b/public/web-icons/windows10/SplashScreen.scale-400.png deleted file mode 100644 index 2b41d978..00000000 Binary files a/public/web-icons/windows10/SplashScreen.scale-400.png and /dev/null differ diff --git a/public/web-icons/windows10/Square150x150Logo.scale-100.png b/public/web-icons/windows10/Square150x150Logo.scale-100.png deleted file mode 100644 index ddad8feb..00000000 Binary files a/public/web-icons/windows10/Square150x150Logo.scale-100.png and /dev/null differ diff --git a/public/web-icons/windows10/Square150x150Logo.scale-125.png b/public/web-icons/windows10/Square150x150Logo.scale-125.png deleted file mode 100644 index 0f71f39c..00000000 Binary files a/public/web-icons/windows10/Square150x150Logo.scale-125.png and /dev/null differ diff --git a/public/web-icons/windows10/Square150x150Logo.scale-150.png b/public/web-icons/windows10/Square150x150Logo.scale-150.png deleted file mode 100644 index 803afb8c..00000000 Binary files a/public/web-icons/windows10/Square150x150Logo.scale-150.png and /dev/null differ diff --git a/public/web-icons/windows10/Square150x150Logo.scale-200.png b/public/web-icons/windows10/Square150x150Logo.scale-200.png deleted file mode 100644 index ad31ae7f..00000000 Binary files a/public/web-icons/windows10/Square150x150Logo.scale-200.png and /dev/null differ diff --git a/public/web-icons/windows10/Square150x150Logo.scale-400.png b/public/web-icons/windows10/Square150x150Logo.scale-400.png deleted file mode 100644 index 14be426f..00000000 Binary files a/public/web-icons/windows10/Square150x150Logo.scale-400.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-16.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-16.png deleted file mode 100644 index 23b915d9..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-16.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-20.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-20.png deleted file mode 100644 index 2b13ad0d..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-20.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-24.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-24.png deleted file mode 100644 index 5b0ed288..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-24.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-256.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-256.png deleted file mode 100644 index caac55ce..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-256.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-30.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-30.png deleted file mode 100644 index ab35d8a3..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-30.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-32.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-32.png deleted file mode 100644 index 261795a4..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-32.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-36.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-36.png deleted file mode 100644 index 76b12a6b..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-36.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-40.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-40.png deleted file mode 100644 index c5448434..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-40.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-44.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-44.png deleted file mode 100644 index 3e475fcb..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-44.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-48.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-48.png deleted file mode 100644 index 4dc7ee3b..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-48.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-60.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-60.png deleted file mode 100644 index f9a90f46..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-60.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-64.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-64.png deleted file mode 100644 index 79e2cfb6..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-64.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-72.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-72.png deleted file mode 100644 index bf67123d..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-72.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-80.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-80.png deleted file mode 100644 index 915e2717..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-80.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-96.png b/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-96.png deleted file mode 100644 index f3962813..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-lightunplated_targetsize-96.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-16.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-16.png deleted file mode 100644 index 23b915d9..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-16.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-20.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-20.png deleted file mode 100644 index 2b13ad0d..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-20.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-24.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-24.png deleted file mode 100644 index 5b0ed288..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-24.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-256.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-256.png deleted file mode 100644 index caac55ce..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-256.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-30.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-30.png deleted file mode 100644 index ab35d8a3..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-30.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-32.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-32.png deleted file mode 100644 index 261795a4..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-32.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-36.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-36.png deleted file mode 100644 index 76b12a6b..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-36.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-40.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-40.png deleted file mode 100644 index c5448434..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-40.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-44.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-44.png deleted file mode 100644 index 3e475fcb..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-44.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-48.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-48.png deleted file mode 100644 index 4dc7ee3b..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-48.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-60.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-60.png deleted file mode 100644 index f9a90f46..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-60.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-64.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-64.png deleted file mode 100644 index 79e2cfb6..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-64.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-72.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-72.png deleted file mode 100644 index bf67123d..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-72.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-80.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-80.png deleted file mode 100644 index 915e2717..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-80.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-96.png b/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-96.png deleted file mode 100644 index f3962813..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.altform-unplated_targetsize-96.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.scale-100.png b/public/web-icons/windows10/Square44x44Logo.scale-100.png deleted file mode 100644 index 3e475fcb..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.scale-100.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.scale-125.png b/public/web-icons/windows10/Square44x44Logo.scale-125.png deleted file mode 100644 index 529bf74a..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.scale-125.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.scale-150.png b/public/web-icons/windows10/Square44x44Logo.scale-150.png deleted file mode 100644 index f24acc26..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.scale-150.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.scale-200.png b/public/web-icons/windows10/Square44x44Logo.scale-200.png deleted file mode 100644 index eb1c479c..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.scale-200.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.scale-400.png b/public/web-icons/windows10/Square44x44Logo.scale-400.png deleted file mode 100644 index da8d70fa..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.scale-400.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-16.png b/public/web-icons/windows10/Square44x44Logo.targetsize-16.png deleted file mode 100644 index 23b915d9..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-16.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-20.png b/public/web-icons/windows10/Square44x44Logo.targetsize-20.png deleted file mode 100644 index 2b13ad0d..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-20.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-24.png b/public/web-icons/windows10/Square44x44Logo.targetsize-24.png deleted file mode 100644 index 5b0ed288..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-24.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-256.png b/public/web-icons/windows10/Square44x44Logo.targetsize-256.png deleted file mode 100644 index caac55ce..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-256.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-30.png b/public/web-icons/windows10/Square44x44Logo.targetsize-30.png deleted file mode 100644 index ab35d8a3..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-30.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-32.png b/public/web-icons/windows10/Square44x44Logo.targetsize-32.png deleted file mode 100644 index 261795a4..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-32.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-36.png b/public/web-icons/windows10/Square44x44Logo.targetsize-36.png deleted file mode 100644 index 76b12a6b..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-36.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-40.png b/public/web-icons/windows10/Square44x44Logo.targetsize-40.png deleted file mode 100644 index c5448434..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-40.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-44.png b/public/web-icons/windows10/Square44x44Logo.targetsize-44.png deleted file mode 100644 index 3e475fcb..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-44.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-48.png b/public/web-icons/windows10/Square44x44Logo.targetsize-48.png deleted file mode 100644 index 4dc7ee3b..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-48.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-60.png b/public/web-icons/windows10/Square44x44Logo.targetsize-60.png deleted file mode 100644 index f9a90f46..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-60.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-64.png b/public/web-icons/windows10/Square44x44Logo.targetsize-64.png deleted file mode 100644 index 79e2cfb6..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-64.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-72.png b/public/web-icons/windows10/Square44x44Logo.targetsize-72.png deleted file mode 100644 index bf67123d..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-72.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-80.png b/public/web-icons/windows10/Square44x44Logo.targetsize-80.png deleted file mode 100644 index 915e2717..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-80.png and /dev/null differ diff --git a/public/web-icons/windows10/Square44x44Logo.targetsize-96.png b/public/web-icons/windows10/Square44x44Logo.targetsize-96.png deleted file mode 100644 index f3962813..00000000 Binary files a/public/web-icons/windows10/Square44x44Logo.targetsize-96.png and /dev/null differ diff --git a/public/web-icons/windows10/StoreLogo.scale-100.png b/public/web-icons/windows10/StoreLogo.scale-100.png deleted file mode 100644 index e1b97cf8..00000000 Binary files a/public/web-icons/windows10/StoreLogo.scale-100.png and /dev/null differ diff --git a/public/web-icons/windows10/StoreLogo.scale-125.png b/public/web-icons/windows10/StoreLogo.scale-125.png deleted file mode 100644 index 0d0cf6c5..00000000 Binary files a/public/web-icons/windows10/StoreLogo.scale-125.png and /dev/null differ diff --git a/public/web-icons/windows10/StoreLogo.scale-150.png b/public/web-icons/windows10/StoreLogo.scale-150.png deleted file mode 100644 index 0c094b89..00000000 Binary files a/public/web-icons/windows10/StoreLogo.scale-150.png and /dev/null differ diff --git a/public/web-icons/windows10/StoreLogo.scale-200.png b/public/web-icons/windows10/StoreLogo.scale-200.png deleted file mode 100644 index e5ba2e43..00000000 Binary files a/public/web-icons/windows10/StoreLogo.scale-200.png and /dev/null differ diff --git a/public/web-icons/windows10/StoreLogo.scale-400.png b/public/web-icons/windows10/StoreLogo.scale-400.png deleted file mode 100644 index 9c07df97..00000000 Binary files a/public/web-icons/windows10/StoreLogo.scale-400.png and /dev/null differ diff --git a/public/web-icons/windows10/Wide310x150Logo.scale-100.png b/public/web-icons/windows10/Wide310x150Logo.scale-100.png deleted file mode 100644 index ee44404a..00000000 Binary files a/public/web-icons/windows10/Wide310x150Logo.scale-100.png and /dev/null differ diff --git a/public/web-icons/windows10/Wide310x150Logo.scale-125.png b/public/web-icons/windows10/Wide310x150Logo.scale-125.png deleted file mode 100644 index c5dc66c4..00000000 Binary files a/public/web-icons/windows10/Wide310x150Logo.scale-125.png and /dev/null differ diff --git a/public/web-icons/windows10/Wide310x150Logo.scale-150.png b/public/web-icons/windows10/Wide310x150Logo.scale-150.png deleted file mode 100644 index ab24fc7a..00000000 Binary files a/public/web-icons/windows10/Wide310x150Logo.scale-150.png and /dev/null differ diff --git a/public/web-icons/windows10/Wide310x150Logo.scale-200.png b/public/web-icons/windows10/Wide310x150Logo.scale-200.png deleted file mode 100644 index c2e4afe6..00000000 Binary files a/public/web-icons/windows10/Wide310x150Logo.scale-200.png and /dev/null differ diff --git a/public/web-icons/windows10/Wide310x150Logo.scale-400.png b/public/web-icons/windows10/Wide310x150Logo.scale-400.png deleted file mode 100644 index 3f0ac575..00000000 Binary files a/public/web-icons/windows10/Wide310x150Logo.scale-400.png and /dev/null differ diff --git a/src/components/LinkItems/StatusIndicator.vue b/src/components/LinkItems/StatusIndicator.vue index 2d53d2ea..c4d6b2d6 100644 --- a/src/components/LinkItems/StatusIndicator.vue +++ b/src/components/LinkItems/StatusIndicator.vue @@ -49,7 +49,7 @@ export default { padding: 5px; transition: all .2s ease-in-out; cursor: help; - z-index: 5; + z-index: 4; &:hover { transform: scale(1.25); filter: saturate(2); diff --git a/src/components/Settings/ThemeSelector.vue b/src/components/Settings/ThemeSelector.vue index 51e0be9f..3ae79195 100644 --- a/src/components/Settings/ThemeSelector.vue +++ b/src/components/Settings/ThemeSelector.vue @@ -127,7 +127,9 @@ export default { * Updates store, which will in turn update theme through watcher */ themeChanged() { - this.$store.commit(Keys.SET_THEME, this.selectedTheme); + const pageId = this.$store.state.currentConfigInfo?.pageId || null; + this.$store.commit(Keys.SET_THEME, { theme: this.selectedTheme, pageId }); + this.updateTheme(this.selectedTheme); }, /* Returns the initial theme */ getInitialTheme() { @@ -164,7 +166,7 @@ export default { this.themeHelper.theme = newTheme; } this.ApplyCustomVariables(newTheme); - localStorage.setItem(localStorageKeys.THEME, newTheme); + // localStorage.setItem(localStorageKeys.THEME, newTheme); }, /* Removes any applied themes */ resetToDefault() { diff --git a/src/components/Widgets/WidgetBase.vue b/src/components/Widgets/WidgetBase.vue index 0e590d12..bb052bff 100644 --- a/src/components/Widgets/WidgetBase.vue +++ b/src/components/Widgets/WidgetBase.vue @@ -141,11 +141,12 @@ export default { widgetOptions() { const options = this.widget.options || {}; const timeout = this.widget.timeout || null; + const ignoreErrors = this.widget.ignoreErrors || false; const useProxy = this.appConfig.widgetsAlwaysUseProxy || !!this.widget.useProxy; const updateInterval = this.widget.updateInterval !== undefined ? this.widget.updateInterval : null; return { - timeout, useProxy, updateInterval, ...options, + timeout, ignoreErrors, useProxy, updateInterval, ...options, }; }, /* A unique string to reference the widget by */ diff --git a/src/mixins/HomeMixin.js b/src/mixins/HomeMixin.js index 9e1e6e0a..97c249f1 100644 --- a/src/mixins/HomeMixin.js +++ b/src/mixins/HomeMixin.js @@ -6,6 +6,7 @@ import Defaults, { localStorageKeys, iconCdns } from '@/utils/defaults'; import Keys from '@/utils/StoreMutations'; import { searchTiles } from '@/utils/Search'; import { checkItemVisibility } from '@/utils/CheckItemVisibility'; +import { GetTheme, ApplyLocalTheme, ApplyCustomVariables } from '@/utils/ThemeHelper'; const HomeMixin = { props: { @@ -40,6 +41,7 @@ const HomeMixin = { watch: { async $route() { await this.getConfigForRoute(); + this.setTheme(); }, }, methods: { @@ -51,6 +53,20 @@ const HomeMixin = { this.$store.commit(Keys.USE_MAIN_CONFIG); } }, + /* TEMPORARY: If on sub-page, check if custom theme is set and return it */ + getSubPageTheme() { + if (!this.pageId || this.pageId === 'home') { + return null; + } else { + const themeStoreKey = `${localStorageKeys.THEME}-${this.pageId}`; + return localStorage[themeStoreKey] || null; + } + }, + setTheme() { + const theme = this.getSubPageTheme() || GetTheme(); + ApplyLocalTheme(theme); + ApplyCustomVariables(theme); + }, updateModalVisibility(modalState) { this.$store.commit('SET_MODAL_OPEN', modalState); }, diff --git a/src/mixins/WidgetMixin.js b/src/mixins/WidgetMixin.js index 4e4385e2..2d3a1e87 100644 --- a/src/mixins/WidgetMixin.js +++ b/src/mixins/WidgetMixin.js @@ -74,7 +74,9 @@ const WidgetMixin = { /* Called when an error occurs. Logs to handler, and passes to parent component */ error(msg, stackTrace) { ErrorHandler(msg, stackTrace); - this.$emit('error', msg); + if (!this.options.ignoreErrors) { + this.$emit('error', msg); + } }, /* When a data request update starts, show loader */ startLoading() { diff --git a/src/store.js b/src/store.js index a8d92f3a..d6c4353b 100644 --- a/src/store.js +++ b/src/store.js @@ -71,7 +71,14 @@ const store = new Vuex.Store({ return state.remoteConfig.pages || []; }, theme(state) { - return state.config.appConfig.theme; + let localTheme = null; + if (state.currentConfigInfo?.pageId) { + const themeStoreKey = `${localStorageKeys.THEME}-${state.currentConfigInfo?.pageId}`; + localTheme = localStorage[themeStoreKey]; + } else { + localTheme = localStorage[localStorageKeys.THEME]; + } + return localTheme || state.config.appConfig.theme; }, webSearch(state, getters) { return getters.appConfig.webSearch || {}; @@ -268,10 +275,13 @@ const store = new Vuex.Store({ config.sections = applyItemId(config.sections); state.config = config; }, - [SET_THEME](state, theme) { + [SET_THEME](state, themOps) { + const { theme, pageId } = themOps; const newConfig = { ...state.config }; newConfig.appConfig.theme = theme; state.config = newConfig; + const themeStoreKey = pageId ? `${localStorageKeys.THEME}-${pageId}` : localStorageKeys.THEME; + localStorage.setItem(themeStoreKey, theme); InfoHandler('Theme updated', InfoKeys.VISUAL); }, [SET_CUSTOM_COLORS](state, customColors) { @@ -318,13 +328,6 @@ const store = new Vuex.Store({ commit(SET_REMOTE_CONFIG, yaml.load((await axios.get('/conf.yml')).data)); const deepCopy = (json) => JSON.parse(JSON.stringify(json)); const config = deepCopy(new ConfigAccumulator().config()); - if (config.appConfig?.theme) { - // Save theme defined in conf.yml as primary - localStorage.setItem(localStorageKeys.PRIMARY_THEME, config.appConfig.theme); - // This will set theme back to primary in case we were on a themed page - // and the index page is loaded w/o navigation (e.g. modifying browser location) - localStorage.setItem(localStorageKeys.THEME, config.appConfig.theme); - } commit(SET_CONFIG, config); }, /* Fetch config for a sub-page (sections and pageInfo only) */ diff --git a/src/styles/color-themes.scss b/src/styles/color-themes.scss index 7d5449ae..1893a01f 100644 --- a/src/styles/color-themes.scss +++ b/src/styles/color-themes.scss @@ -698,7 +698,10 @@ html[data-theme='material'], html[data-theme='material-dark'] { html[data-theme='material'] { --primary: #363636; --background: #eee; - --background-darker: #5c90eb; + --white2: #f5f5f5; + --grey2: #473f3f; + --background-darker: #4285f4; + --background-darker2: #0c4eba; --item-group-outer-background: none; --item-group-shadow: none; --item-group-background: none; @@ -709,31 +712,31 @@ html[data-theme='material'] { --item-text-color: var(--primary); --item-group-heading-text-color-hover: var(--primary); --item-icon-transform-hover: none; - --nav-link-background-color: #0c4eba; + --nav-link-background-color: var(--background-darker2); --nav-link-text-color: var(--white); - --nav-link-border-color: #0c4eba; + --nav-link-border-color: var(--background-darker2); --settings-text-color: var(--primary); --config-code-color: var(--primary); - --config-settings-background: #f5f5f5; - --config-settings-color: #473f3f; - --interactive-editor-color: #473f3f; - --interactive-editor-background: #f5f5f5; + --config-settings-background: var(--white2); + --config-settings-color: var(--grey2); + --interactive-editor-color: var(--grey2); + --interactive-editor-background: var(--white2); --interactive-editor-background-darker: var(--white); --heading-text-color: var(--white); --curve-factor: 3px; --curve-factor-navbar: 8px; - --search-container-background: #4285f4; - --welcome-popup-text-color: #f5f5f5; - --footer-text-color: #f5f5f5cc; - // --login-form-background-secondary: #f5f5f5cc; + --search-container-background: var(--background-darker); + --welcome-popup-text-color: var(--white2); + --footer-text-color: var(--white2); + // --login-form-background-secondary: var(--white2); --context-menu-background: var(--white); - --context-menu-secondary-color: #f5f5f5; + --context-menu-secondary-color: var(--white2); --transparent-white-50: #00000080; --status-check-tooltip-background: var(--white); --description-tooltip-background: var(--white); - --description-tooltip-color: #473f3f; - --side-bar-background-lighter: #0c4eba; - --side-bar-item-background: #f5f5f5; + --description-tooltip-color: var(--grey2); + --side-bar-background-lighter: var(--background-darker2); + --side-bar-item-background: var(--white2); --minimal-view-background-color: var(--background); --minimal-view-title-color: var(--background-darker); @@ -757,19 +760,15 @@ html[data-theme='material'] { box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24); } div.minimal-section-heading.selected { - background: #5c90eb; - } - div.minimal-section-inner { - background: #ffffff80; + background: var(--background-darker); } div.jsoneditor div.jsoneditor-menu { - background: #5c90eb !important; + background: var(--background-darker) !important; } header { - background: #4285f4; - color: var(--white); + color: var(--primary); .page-titles span.subtitle { text-shadow: none; } @@ -782,13 +781,13 @@ html[data-theme='material'] { color: var(--white); } .prism-editor-wrapper { - background: #f5f5f5; + background: var(--white2); } .item:focus { - outline-color: #4285f4cc; + outline-color: var(--background-darker); } .widget-base { - background: #f5f5f5; + background: var(--white2); box-shadow: var(--item-shadow); padding: 0.5rem; margin: 0.25rem 0; diff --git a/src/views/Minimal.vue b/src/views/Minimal.vue index fe16f701..4cde1465 100644 --- a/src/views/Minimal.vue +++ b/src/views/Minimal.vue @@ -57,7 +57,6 @@ import HomeMixin from '@/mixins/HomeMixin'; import MinimalSection from '@/components/MinimalView/MinimalSection.vue'; import MinimalHeading from '@/components/MinimalView/MinimalHeading.vue'; import MinimalSearch from '@/components/MinimalView/MinimalSearch.vue'; -import { GetTheme, ApplyLocalTheme, ApplyCustomVariables } from '@/utils/ThemeHelper'; import { localStorageKeys } from '@/utils/defaults'; import ConfigLauncher from '@/components/Settings/ConfigLauncher'; @@ -74,10 +73,8 @@ export default { layout: '', selectedSection: 0, // The index of currently selected section tabbedView: true, // By default use tabs, when searching then show all instead - theme: GetTheme(), }), watch: { - /* When the theme changes, then call the update method */ searchValue() { this.tabbedView = !this.searchValue || this.searchValue.length === 0; }, @@ -125,18 +122,11 @@ export default { } return ''; }, - /* If theme present, then call helper to apply it, and any custom colors */ - applyTheme() { - if (this.theme) { - ApplyLocalTheme(this.theme); - ApplyCustomVariables(this.theme); - } - }, }, mounted() { this.initiateFontAwesome(); this.initiateMaterialDesignIcons(); - this.applyTheme(); + this.setTheme(); }, }; diff --git a/src/views/Workspace.vue b/src/views/Workspace.vue index 452b3e2d..972ad91c 100644 --- a/src/views/Workspace.vue +++ b/src/views/Workspace.vue @@ -61,11 +61,6 @@ export default { this.url = ''; this.widgets = widgets; }, - setTheme() { - const theme = this.GetTheme(); - this.ApplyLocalTheme(theme); - this.ApplyCustomVariables(theme); - }, initiateFontAwesome() { const fontAwesomeScript = document.createElement('script'); const faKey = this.appConfig.fontAwesomeKey || Defaults.fontAwesomeKey;