Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/authentication/renderer/authentication.main.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/callbox/renderer/callbox.main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/certificate/renderer/certificate.main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 1 addition & 1 deletion src/help/renderer/help.app.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions src/shared/assets/global.styles.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*!
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
Expand All @@ -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';
23 changes: 23 additions & 0 deletions src/shared/assets/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/*!
* 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;
/* Make it more desktop-like and less a web-page: remove the image, keep only plain color */
--image-background: none;
}
2 changes: 1 addition & 1 deletion src/talk/renderer/TitleBar/TitleBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/talk/renderer/TitleBar/components/MainMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
26 changes: 0 additions & 26 deletions src/talk/renderer/assets/styles.css

This file was deleted.

6 changes: 2 additions & 4 deletions src/talk/renderer/talk.main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*!
* SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion src/upgrade/renderer/upgrade.main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down