diff --git a/.gitignore b/.gitignore index 781dce0..3772294 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ node_modules .DS_* package-lock.json dist/ +.idea/ diff --git a/app/init.js b/app/init.js index 266e9d5..6b654f1 100644 --- a/app/init.js +++ b/app/init.js @@ -7,8 +7,8 @@ angApp.constant('AppInfo', { APP_HOME: 'https://github.com/conversejs/converse-desktop', APP_RELEASES_CHECK_URL: 'https://api.github.com/repos/conversejs/converse-desktop/releases', APP_RELEASES_URL: 'https://github.com/conversejs/converse-desktop/releases', - CONVERSE_VERSION: 'v7.0.4', - ELECTRON_VERSION: '11.2.3' + CONVERSE_VERSION: 'v9.0.0', + ELECTRON_VERSION: '13.6.6' }); module.exports = angApp diff --git a/app/views/default/page.html b/app/views/default/page.html index de6efd7..8757b08 100644 --- a/app/views/default/page.html +++ b/app/views/default/page.html @@ -1,4 +1,5 @@
+
@@ -18,7 +19,4 @@
-
-
-
diff --git a/index.html b/index.html index 931266a..436a80c 100644 --- a/index.html +++ b/index.html @@ -14,7 +14,6 @@ -
diff --git a/package.json b/package.json index 3d716cd..8332fa1 100644 --- a/package.json +++ b/package.json @@ -23,13 +23,13 @@ "author": "Nick Denry ", "license": "MPL-2.0", "devDependencies": { - "electron": "11.2.3", + "electron": "^13.0.0", "electron-builder": "^22.9.1", "electron-packager": "^15.2.0" }, "dependencies": { "angular": "^1.7.9", - "converse.js": "7.0.4", + "converse.js": "^9.0.0", "electron-settings": "^4.0.2", "github-buttons": "^2.8.0", "keytar": "^7.3.0", diff --git a/resources/css/app.css b/resources/css/app.css index 261a781..b9353fd 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -20,39 +20,43 @@ a { color: #777; } -.main-background { +.main-window { background: #f8f8f8; height: 100%; - left: 0px; + left: 0; position: fixed; - top: 0px; + top: 0; width: 100%; z-index: -1; } -.conversejs-adoption { - background: transparent; - pointer-events: none; - position: fixed; - left: 0px; - top: 0px; +.main-window > div { width: 100%; height: 100%; } -#conversejs .converse-chatboxes { - pointer-events: none; + +.conversejs converse-chats.converse-embedded .chat-body { + height: 50%; + flex-grow: 1; } -#conversejs .converse-chatboxes > * { - pointer-events: auto; +.conversejs converse-chats.converse-embedded .chatbox { + width: 100%; } -.chat-body { - overflow: hidden; - } - -#conversejs.converse-embedded .chatbox { - flex-grow: 1 !important; - flex-shrink: 1 !important; +.conversejs converse-chats.converse-embedded .flyout { + position: static; +} + +.conversejs .chatbox .bottom-panel .sendXMPPMessage .chat-textarea { + margin-bottom: 0; +} + +.conversejs converse-chats.converse-embedded #controlbox { + padding: 0; +} + +.conversejs converse-chats.converse-embedded .chatbox { + margin-left: 0; } diff --git a/resources/css/page-default.css b/resources/css/page-default.css index 00d998a..b044a02 100644 --- a/resources/css/page-default.css +++ b/resources/css/page-default.css @@ -1,9 +1,15 @@ +.page-default { + width: 100%; + height: 100%; +} + .chimeverse-branding { - left: 50%; position: absolute; + left: 50%; top: 50%; transform: translate(-50%, -50%); text-align: center; + z-index: -1; } .chimeverse-branding__img {