Merge pull request #13622 from nextcloud/backport/13619/stable30.0

nextcloud · Oct 24, 2024 · 1bb8231 · 1bb8231
2 parents 914b217 + 54d9b01
commit 1bb8231
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -796,6 +796,11 @@ body.talk-in-fullscreen {
 		border-radius: 0;
 	}
 }
+
+// Overwrites styles from public.scss in public conversations
+body#body-public {
+	--footer-height: 0;
+}
 </style>
 
 <style lang="scss" scoped>

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
@@ -8,6 +8,7 @@
 		:class="{
 			'top-bar--sidebar': isSidebar,
 			'top-bar--in-call': isInCall,
+			'top-bar--authorised': getUserId,
 		}">
 		<ConversationIcon :key="conversation.token"
 			class="conversation-icon"
@@ -382,6 +383,12 @@ export default {
 			margin-left: 0;
 		}
 	}
+
+	&--authorised {
+		.conversation-icon {
+			margin-left: calc(var(--default-clickable-area) + var(--default-grid-baseline));
+		}
+	}
 }
 
 .top-bar__wrapper {
@@ -393,10 +400,6 @@ export default {
 	justify-content: flex-end;
 }
 
-.conversation-icon {
-	margin-left: 48px;
-}
-
 .conversation-header {
 	position: relative;
 	display: flex;