Merge branch 'master' into development

bang-olufsen · Jan 3, 2021 · ebaef93 · ebaef93
2 parents fc9135b + 14166f7
commit ebaef93
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 51 deletions.
diff --git a/Beocreate2/beo-views/default/index.html b/Beocreate2/beo-views/default/index.html
@@ -9,6 +9,8 @@
  <meta name="viewport" content="initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover">
  <meta name="apple-mobile-web-app-capable" content="yes">
  <meta name="apple-mobile-web-app-status-bar-style" content="default">
+
+ <link rel="manifest" href="views/default/manifest.json">
  <link rel="apple-touch-icon" href="views/default/apple-touch-icon.png?v=1" />
 
  <link rel="stylesheet" type="text/css" href="views/default/beostyle2018.css" />

diff --git a/Beocreate2/beo-views/default/manifest.json b/Beocreate2/beo-views/default/manifest.json
@@ -1,4 +1,27 @@
 {
+ "short_name": "Beocreate",
+ "name": "Beocreate",
+ "description": "Upcyle your old speakers.",
+ "start_url": "/",
+ "background_color": "#222",
+ "display": "standalone",
+ "scope": "/",
+ "theme_color": "#222",
+ "shortcuts": [],
+ "icons": [
+ {
+ "src": "maskable_icon.png",
+ "type": "image/png",
+ "sizes": "300x300",
+ "purpose": "maskable"
+ },
+ {
+ "src": "apple-touch-icon.png?v=1",
+ "type": "image/png",
+ "sizes": "300x300",
+ "purpose": "any"
+ }
+ ],
  "navigationSets": [
  {"id": "full", "items": [
  {"name": "product-information", "kind": "extension"},

diff --git a/Beocreate2/beo-views/default/maskable_icon.png b/Beocreate2/beo-views/default/maskable_icon.png
diff --git a/BeocreateConnect/package-lock.json b/BeocreateConnect/package-lock.json
diff --git a/BeocreateConnect/package.json b/BeocreateConnect/package.json
@@ -13,7 +13,7 @@
  "author": "",
  "license": "MIT",
  "devDependencies": {
- "electron": "^8.3.0",
+ "electron": "^8.5.1",
  "electron-builder": "^21.2.0",
  "electron-rebuild": "^1.11.0",
  "node-hid": "^1.2.0"