Skip to content

Commit e107d6c

Browse files
committed
WIP
Signed-off-by: Grigorii K. Shartsev <[email protected]>
1 parent 124195c commit e107d6c

File tree

3 files changed

+43
-17
lines changed

3 files changed

+43
-17
lines changed

src/talk/renderer/DesktopHeader.vue

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<template>
2323
<header id="header" class="header">
2424
<div class="header__inner">
25-
<div v-if="!OS.isMac"
26-
class="header__title-wrapper"
27-
role="button"
28-
tabindex="0"
29-
@click="pushToRoot">
30-
<span class="header__title">Nextcloud Talk</span>
31-
<span class="header__preview-badge">Preview</span>
32-
</div>
25+
<!-- <div v-if="!OS.isMac"-->
26+
<!-- class="header__title-wrapper"-->
27+
<!-- role="button"-->
28+
<!-- tabindex="0"-->
29+
<!-- @click="pushToRoot">-->
30+
<!-- <span class="header__title">Nextcloud Talk</span>-->
31+
<!-- <span class="header__preview-badge">Preview</span>-->
32+
<!-- </div>-->
3333

3434
<div class="spacer" />
3535

@@ -86,13 +86,34 @@ export default {
8686
}
8787
</script>
8888

89+
<style>
90+
:root {
91+
--talk-desktop-menu: 54px;
92+
}
93+
94+
.top-bar {
95+
padding-right: var(--talk-desktop-menu) !important;
96+
}
97+
98+
.app-sidebar-header__desc {
99+
padding-right: calc(50px + var(--talk-desktop-menu)) !important;
100+
}
101+
102+
.app-sidebar__close {
103+
right: calc(6px + var(--talk-desktop-menu)) !important;
104+
}
105+
</style>
106+
89107
<style scoped>
90108
.header {
91-
height: 50px;
109+
height: 60px;
92110
box-sizing: border-box;
93-
margin-bottom: -50px;
111+
/*margin-bottom: -50px;*/
94112
color: #FFF;
95-
user-select: none;
113+
position: absolute;
114+
top: 0;
115+
right: 0;
116+
z-index: 1000;
96117
}
97118
98119
.header__inner {

src/talk/renderer/assets/overrides.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@
2525
:root {
2626
/* It is IMPORTANT to set "px" here, not just "0" */
2727
--body-container-margin: 0px;
28+
--body-height: 100%;
2829
}
2930

3031
#content-vue {
3132
border-radius: 0 !important;
3233
}
34+
35+
.content {
36+
margin-top: 0 !important;
37+
}

src/talk/talk.window.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ function createTalkWindow() {
4040
preload: TALK_WINDOW_PRELOAD_WEBPACK_ENTRY,
4141
},
4242
icon: getBrowserWindowIcon(),
43-
titleBarStyle: 'hidden',
44-
titleBarOverlay: {
45-
color: '#00669E00', // Transparent
46-
symbolColor: '#FFFFFF', // White
47-
height: 50,
48-
},
43+
// titleBarStyle: 'hidden',
44+
// titleBarOverlay: {
45+
// color: '#00669E00', // Transparent
46+
// symbolColor: '#FFFFFF', // White
47+
// height: 50,
48+
// },
4949
// Position of the top left corner of the traffic light on Mac
5050
trafficLightPosition: {
5151
x: 12, // In line with SearchBox

0 commit comments

Comments
 (0)