resolve merge conflicts

This commit is contained in:
bobsfriend12 2023-03-05 21:02:05 -06:00
commit 081ecb6fee
2 changed files with 33 additions and 0 deletions

View File

@ -18,6 +18,7 @@
href="https://cdn.datatables.net/v/bs4/dt-1.10.22/fh-3.1.7/r-2.2.6/sc-2.0.3/sp-1.2.2/datatables.min.css" />
<link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
<link rel="stylesheet" href="/static/assets/css/crafty.css">
<link rel="manifest" href="/static/assets/crafty.webmanifest">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-capable" content="yes">

View File

@ -0,0 +1,32 @@
{
"$schema": "https://json.schemastore.org/web-manifest-combined.json",
"short_name": "Crafty",
"name": "Crafty Controller 4",
"icons": [
{
"src": "../static/assets/images/Crafty_4-0.png",
"type": "image/png",
"sizes": "192x192"
}
],
"start_url": "/public/login",
"background_color": "#3367D6",
"display": "fullscreen",
"scope": "/",
"theme_color": "#3367D6",
"shortcuts": [
{
"name": "Crafty Controller 4",
"short_name": "Crafty",
"description": "View weather information for today",
"url": "/panel/dashboard",
"icons": [
{
"src": "../static/assets/images/Crafty_4-0.png",
"sizes": "192x192"
}
]
}
],
"description": "Server Management Console/Wrapper"
}