From 6b6c18ef5c6a8f9ddaa0b1faa3880b174df9cf24 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Fri, 14 Nov 2025 21:06:40 +0100
Subject: [PATCH 1/3] chore(talk): remove --color-background-plain-text
 Nextcloud 29 fallback

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/talk/renderer/TitleBar/TitleBar.vue            | 2 +-
 src/talk/renderer/TitleBar/components/MainMenu.vue | 2 +-
 src/talk/renderer/assets/styles.css                | 9 ---------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/talk/renderer/TitleBar/TitleBar.vue b/src/talk/renderer/TitleBar/TitleBar.vue
index 3d5b15571..3a30fe434 100644
--- a/src/talk/renderer/TitleBar/TitleBar.vue
+++ b/src/talk/renderer/TitleBar/TitleBar.vue
@@ -62,7 +62,7 @@ const { isDevMode } = useDevMode()
 	height: var(--header-height);
 	margin-bottom: calc(-1 * var(--header-height));
 	box-sizing: border-box;
-	color: var(--color-header-contrast);
+	color: var(--color-background-plain-text);
 	user-select: none;
 }
 
diff --git a/src/talk/renderer/TitleBar/components/MainMenu.vue b/src/talk/renderer/TitleBar/components/MainMenu.vue
index 37bf21224..08648d418 100644
--- a/src/talk/renderer/TitleBar/components/MainMenu.vue
+++ b/src/talk/renderer/TitleBar/components/MainMenu.vue
@@ -38,7 +38,7 @@ const openInWeb = () => window.open(generateUrl(getCurrentTalkRoutePath()), '_bl
 		variant="tertiary-no-background"
 		container="body">
 		<template #icon>
-			<IconMenu :size="20" fill-color="var(--color-header-contrast)" />
+			<IconMenu :size="20" fill-color="var(--color-background-plain-text)" />
 		</template>
 
 		<template v-if="isTalkInitialized">
diff --git a/src/talk/renderer/assets/styles.css b/src/talk/renderer/assets/styles.css
index 646ee6fa0..61a3059e3 100644
--- a/src/talk/renderer/assets/styles.css
+++ b/src/talk/renderer/assets/styles.css
@@ -15,12 +15,3 @@
 :focus-visible {
 	outline-color: var(--color-main-text);
 }
-
-#header {
-	/*
-		Adjusting of text and icons appearing on Nextcloud header to contrast with.
-		Nextcloud (28-29) server has a workaround with '--background-image-color-text' variable.
-		Starting from Nextcloud 30 server has '--color-background-plain-text' variable.
-	*/
-	--color-header-contrast: var(--color-background-plain-text, var(--background-image-color-text, #ffffff))
-}

From 85d18858740ced880bdbd49f07dcb11956dee6d8 Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Fri, 14 Nov 2025 21:22:58 +0100
Subject: [PATCH 2/3] refactor: share Talk Desktop global styles and clean-up

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 .../renderer/authentication.main.js           |  2 +-
 src/callbox/renderer/callbox.main.ts          |  2 +-
 src/certificate/renderer/certificate.main.ts  |  2 +-
 src/help/renderer/help.app.js                 |  2 +-
 src/shared/assets/global.styles.css           |  4 ++--
 src/shared/assets/styles.css                  | 21 +++++++++++++++++++
 src/talk/renderer/assets/styles.css           | 17 ---------------
 src/talk/renderer/talk.main.ts                |  6 ++----
 .../{assets/overrides.css => talk.styles.css} |  9 +-------
 src/upgrade/renderer/upgrade.main.ts          |  2 +-
 10 files changed, 31 insertions(+), 36 deletions(-)
 create mode 100644 src/shared/assets/styles.css
 delete mode 100644 src/talk/renderer/assets/styles.css
 rename src/talk/renderer/{assets/overrides.css => talk.styles.css} (71%)

diff --git a/src/authentication/renderer/authentication.main.js b/src/authentication/renderer/authentication.main.js
index 0b3c37e98..ebf173a6c 100644
--- a/src/authentication/renderer/authentication.main.js
+++ b/src/authentication/renderer/authentication.main.js
@@ -6,7 +6,7 @@
 import { createApp } from 'vue'
 import { setupWebPage } from '../../shared/setupWebPage.js'
 
-import '../../shared/assets/global.styles.css'
+import '../../shared/assets/styles.css'
 
 await setupWebPage()
 
diff --git a/src/callbox/renderer/callbox.main.ts b/src/callbox/renderer/callbox.main.ts
index 04b8cdff2..c7a05dce7 100644
--- a/src/callbox/renderer/callbox.main.ts
+++ b/src/callbox/renderer/callbox.main.ts
@@ -6,7 +6,7 @@
 import { createApp } from 'vue'
 import { setupWebPage } from '../../shared/setupWebPage.js'
 
-import '../../shared/assets/global.styles.css'
+import '../../shared/assets/styles.css'
 
 await setupWebPage()
 
diff --git a/src/certificate/renderer/certificate.main.ts b/src/certificate/renderer/certificate.main.ts
index 978391e38..48bfacc17 100644
--- a/src/certificate/renderer/certificate.main.ts
+++ b/src/certificate/renderer/certificate.main.ts
@@ -6,7 +6,7 @@
 import { createApp } from 'vue'
 import { setupWebPage } from '../../shared/setupWebPage.js'
 
-import '../../shared/assets/global.styles.css'
+import '../../shared/assets/styles.css'
 
 await setupWebPage()
 
diff --git a/src/help/renderer/help.app.js b/src/help/renderer/help.app.js
index 7d19568ac..ba10675b5 100644
--- a/src/help/renderer/help.app.js
+++ b/src/help/renderer/help.app.js
@@ -6,7 +6,7 @@
 import { createApp } from 'vue'
 import { setupWebPage } from '../../shared/setupWebPage.js'
 
-import '../../shared/assets/global.styles.css'
+import '../../shared/assets/styles.css'
 import './help.styles.css'
 
 await setupWebPage()
diff --git a/src/shared/assets/global.styles.css b/src/shared/assets/global.styles.css
index 00dc23724..5bf386cac 100644
--- a/src/shared/assets/global.styles.css
+++ b/src/shared/assets/global.styles.css
@@ -1,4 +1,4 @@
-/*
+/*!
  * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
@@ -11,6 +11,6 @@
 @import '@global-styles/apps/theming/theme/light.plain.css' (prefers-color-scheme: light);
 @import '@global-styles/apps/theming/theme/dark.plain.css' (prefers-color-scheme: dark);
 
-/*!* Theme styles for explicit set themes *!*/
+/* Theme styles for explicit set themes */
 @import '@global-styles/apps/theming/theme/light.css';
 @import '@global-styles/apps/theming/theme/dark.css';
diff --git a/src/shared/assets/styles.css b/src/shared/assets/styles.css
new file mode 100644
index 000000000..af96d2734
--- /dev/null
+++ b/src/shared/assets/styles.css
@@ -0,0 +1,21 @@
+/*!
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+@import './global.styles.css';
+
+* {
+	box-sizing: border-box;
+}
+
+:focus-visible {
+	outline-color: var(--color-main-text);
+}
+
+:root /* The base variables calculation */,
+body /* Theming overrides */{
+	/* It is IMPORTANT to set value in "px" for further calculations */
+	--body-container-margin: 0px !important;
+	--body-container-radius: 0 !important;
+}
diff --git a/src/talk/renderer/assets/styles.css b/src/talk/renderer/assets/styles.css
deleted file mode 100644
index 61a3059e3..000000000
--- a/src/talk/renderer/assets/styles.css
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
- * SPDX-License-Identifier: AGPL-3.0-or-later
- */
-
-* {
-	/*
-		It's safe to reset box-sizing for all the page.
-		In Nextcloud (at least 26) box-sizing is set to border-box to the entire <NcContent> (#content-vue .content).
-		Nextcloud Talk Desktop has only <NcContent> and its own components.
-	*/
-	box-sizing: border-box;
-}
-
-:focus-visible {
-	outline-color: var(--color-main-text);
-}
diff --git a/src/talk/renderer/talk.main.ts b/src/talk/renderer/talk.main.ts
index dd925853a..a2fe4d733 100644
--- a/src/talk/renderer/talk.main.ts
+++ b/src/talk/renderer/talk.main.ts
@@ -6,12 +6,10 @@
 import { setupWebPage } from '../../shared/setupWebPage.js'
 import { createTalkDesktopApp } from './TalkDesktop.app.ts'
 
-import '../../shared/assets/global.styles.css'
+import '../../shared/assets/styles.css'
 import '@talk/src/icons.css'
-import './assets/styles.css'
-import './assets/overrides.css'
+import './talk.styles.css'
 
-// Initially open the Welcome page, if not specified
 await setupWebPage()
 
 await createTalkDesktopApp()
diff --git a/src/talk/renderer/assets/overrides.css b/src/talk/renderer/talk.styles.css
similarity index 71%
rename from src/talk/renderer/assets/overrides.css
rename to src/talk/renderer/talk.styles.css
index b24b33a89..119a451d9 100644
--- a/src/talk/renderer/assets/overrides.css
+++ b/src/talk/renderer/talk.styles.css
@@ -1,4 +1,4 @@
-/**
+/*!
  * SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
@@ -7,13 +7,6 @@
  * Overrides default Nextcloud styles
  */
 
-:root,
-body {
-	/* It is IMPORTANT to set "px" here, not just "0" */
-	--body-container-margin: 0px !important;
-	--body-container-radius: 0 !important;
-}
-
 #content {
 	margin-top: var(--header-height) !important;
 }
diff --git a/src/upgrade/renderer/upgrade.main.ts b/src/upgrade/renderer/upgrade.main.ts
index 11966a92f..e83dd7719 100644
--- a/src/upgrade/renderer/upgrade.main.ts
+++ b/src/upgrade/renderer/upgrade.main.ts
@@ -6,7 +6,7 @@
 import { createApp } from 'vue'
 import { setupWebPage } from '../../shared/setupWebPage.js'
 
-import '../../shared/assets/global.styles.css'
+import '../../shared/assets/styles.css'
 
 await setupWebPage()
 

From ba3e8f93b06b62c8fc417b40cb4088956c2a361d Mon Sep 17 00:00:00 2001
From: "Grigorii K. Shartsev" <me@shgk.me>
Date: Fri, 14 Nov 2025 21:52:01 +0100
Subject: [PATCH 3/3] feat: remove background image

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
---
 src/shared/assets/styles.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/shared/assets/styles.css b/src/shared/assets/styles.css
index af96d2734..8d11e36c9 100644
--- a/src/shared/assets/styles.css
+++ b/src/shared/assets/styles.css
@@ -18,4 +18,6 @@ body /* Theming overrides */{
 	/* It is IMPORTANT to set value in "px" for further calculations */
 	--body-container-margin: 0px !important;
 	--body-container-radius: 0 !important;
+	/* Make it more desktop-like and less a web-page: remove the image, keep only plain color */
+	--image-background: none;
 }