Skip to content

Commit

Permalink
Merge branch 'hotfix/2.24.5' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Lakeyzer committed Apr 30, 2024
2 parents 0ae343f + c7d4015 commit a16e7d5
Show file tree
Hide file tree
Showing 39 changed files with 22 additions and 20 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.24.4",
"version": "2.24.5",
"name": "shieldmaiden",
"description": "A Dungeons and Dragons Combat Tracker",
"productName": "Shieldmaiden",
Expand Down
Binary file modified public/favicon.ico
Binary file not shown.
Binary file added public/icons/apple-icon-120x120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/icons/apple-icon-152x152.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/icons/apple-icon-167x167.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/icons/apple-icon-180x180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added public/icons/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added public/icons/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
Binary file added public/icons/favicon.ico
Binary file not shown.
File renamed without changes
Binary file added public/icons/icon-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file removed public/img/icons/icon-512x512.png
Diff not rendered.
24 changes: 12 additions & 12 deletions quasar.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,61 +137,61 @@ module.exports = function (/* ctx */) {
categories: ["games", "entertainment"],
icons: [
{
src: "img/icons/transparent-512x512.png",
src: "icons/transparent-512x512.png",
sizes: "512x512",
type: "image/png",
purpose: "any",
},
{
src: "img/icons/maskable-512x512.png",
src: "icons/maskable-512x512.png",
sizes: "512x512",
type: "image/png",
purpose: "maskable",
},
{
src: "img/icons/transparent-192x192.png",
src: "icons/transparent-192x192.png",
sizes: "192x192",
type: "image/png",
purpose: "any",
},
{
src: "img/icons/maskable-192x192.png",
src: "icons/maskable-192x192.png",
sizes: "192x192",
type: "image/png",
purpose: "maskable",
},
{
src: "img/icons/ms/app-icon-44x44.png",
src: "icons/ms/app-icon-44x44.png",
sizes: "44x44",
type: "image/png",
purpose: "any",
},
{
src: "img/icons/ms/small-tile-71x71.png",
src: "icons/ms/small-tile-71x71.png",
sizes: "71x71",
type: "image/png",
purpose: "any",
},
{
src: "img/icons/ms/wide-tile-350x150.png",
src: "icons/ms/wide-tile-350x150.png",
sizes: "350x150",
type: "image/png",
purpose: "any",
},
{
src: "img/icons/ms/large-tile-310x310.png",
src: "icons/ms/large-tile-310x310.png",
sizes: "310x310",
type: "image/png",
purpose: "any",
},
{
src: "img/icons/ms/store-logo-50x50.png",
src: "icons/ms/store-logo-50x50.png",
sizes: "50x50",
type: "image/png",
purpose: "any",
},
{
src: "img/icons/ms/splash-screen-620x300.png",
src: "icons/ms/splash-screen-620x300.png",
sizes: "620x300",
type: "image/png",
purpose: "any",
Expand All @@ -204,7 +204,7 @@ module.exports = function (/* ctx */) {
url: "/content/campaigns",
icons: [
{
src: "/img/icons/shortcuts/campaigns-512x512.png",
src: "/icons/shortcuts/campaigns-512x512.png",
sizes: "512x512",
type: "image/png",
purpose: "any",
Expand All @@ -217,7 +217,7 @@ module.exports = function (/* ctx */) {
url: "/content/characters",
icons: [
{
src: "/img/icons/shortcuts/characters-512x512.png",
src: "/icons/shortcuts/characters-512x512.png",
sizes: "512x512",
type: "image/png",
purpose: "any",
Expand Down
12 changes: 7 additions & 5 deletions src/index.template.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" />
<link rel="icon" href="favicon.ico" />
<link rel="icon" sizes="48x48" href="img/icons/favicon-48x48.png" />
<link rel="icon" sizes="96x96" href="img/icons/favicon-96x96.png" />
<link rel="icon" sizes="144x144" href="img/icons/favicon-144x144.png" />
<link rel="icon" sizes="192x192" href="img/icons/favicon-192x192.png" />
<link rel="icon" href="/favicon.ico" />
<link rel="icon" sizes="16x16" href="/icons/favicon-16x16.png" />
<link rel="icon" sizes="32x32" href="/icons/favicon-32x32.png" />
<link rel="icon" sizes="48x48" href="/icons/favicon-48x48.png" />
<link rel="icon" sizes="96x96" href="/icons/favicon-96x96.png" />
<link rel="icon" sizes="144x144" href="/icons/favicon-144x144.png" />
<link rel="icon" sizes="192x192" href="/icons/favicon-192x192.png" />
<meta name="theme-color" content="#191919" />

<!-- Google -->
Expand Down

0 comments on commit a16e7d5

Please sign in to comment.