Skip to content

New design 3 - Combine custom title bar with Talk's top bar #622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+39 −14
Draft

New design 3 - Combine custom title bar with Talk's top bar #622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 33 additions & 13 deletions src/talk/renderer/DesktopHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
<template>
<header id="header" class="header">
<div class="header__inner">
<div v-if="!OS.isMac"
class="header__title-wrapper"
role="button"
tabindex="0"
@click="pushToRoot">
<span class="header__title">Nextcloud Talk</span>
<span class="header__preview-badge">Preview</span>
</div>
<!-- <div v-if="!OS.isMac"-->
<!-- class="header__title-wrapper"-->
<!-- role="button"-->
<!-- tabindex="0"-->
<!-- @click="pushToRoot">-->
<!-- <span class="header__title">Nextcloud Talk</span>-->
<!-- <span class="header__preview-badge">Preview</span>-->
<!-- </div>-->

<div class="spacer" />

Expand Down Expand Up @@ -86,13 +86,34 @@ export default {
}
</script>

<style>
:root {
--talk-desktop-menu: calc(100vw - (env(titlebar-area-width, 100vw) - 54px));
}

body:has(.app-sidebar[style='display: none;']) .top-bar {
padding-right: var(--talk-desktop-menu) !important;
}

.app-sidebar-header__desc {
padding-right: calc(50px + var(--talk-desktop-menu)) !important;
}

.app-sidebar__close {
right: calc(6px + var(--talk-desktop-menu)) !important;
}
</style>

<style scoped>
.header {
height: 50px;
height: 60px;
box-sizing: border-box;
margin-bottom: -50px;
/*margin-bottom: -50px;*/
color: #FFF;
user-select: none;
position: absolute;
top: 0;
right: calc(100vw - env(titlebar-area-width, 100vw));
z-index: 1000;
}

.header__inner {
Expand All @@ -102,7 +123,6 @@ export default {
height: 100%;
/* Save space for native title bar buttons */
margin-inline-start: env(titlebar-area-x, 0);
width: env(titlebar-area-width, 100%);
}

.header__item {
Expand Down Expand Up @@ -136,6 +156,6 @@ export default {
flex: 1 0 auto;
height: 100%;
/* Allow to drag the window using header */
app-region: drag;
/*app-region: drag;*/
}
</style>
5 changes: 5 additions & 0 deletions src/talk/renderer/assets/overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,13 @@
:root {
/* It is IMPORTANT to set "px" here, not just "0" */
--body-container-margin: 0px;
--body-height: 100%;
}

#content-vue {
border-radius: 0 !important;
}

.content {
margin-top: 0 !important;
}
2 changes: 1 addition & 1 deletion src/talk/talk.window.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function createTalkWindow() {
titleBarOverlay: {
color: '#00669E00', // Transparent
symbolColor: '#FFFFFF', // White
height: 50,
height: 60,
},
// Position of the top left corner of the traffic light on Mac
trafficLightPosition: {
Expand Down