From 0c6e125e1c8840ef11964fad9e0d771f75bb756e Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 10 Aug 2022 10:41:27 +0200
Subject: Move public share sidebar to vue button

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/PublicShareSidebar.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index 8b5afcda9..a81191a15 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -26,10 +26,15 @@
 			<div v-if="!conversation" class="emptycontent room-not-joined">
 				<div class="icon icon-talk" />
 				<h2>{{ t('spreed', 'Discuss this file') }}</h2>
-				<button class="primary" :disabled="joiningConversation" @click="joinConversation">
+				<ButtonVue type="primary"
+					class="button-centered"
+					:disabled="joiningConversation"
+					@click="joinConversation">
+					<template #icon>
+						<span v-if="joiningConversation" class="icon icon-loading-small" />
+					</template>
 					{{ t('spreed', 'Join conversation') }}
-					<span v-if="joiningConversation" class="icon icon-loading-small" />
-				</button>
+				</ButtonVue>
 			</div>
 			<template v-else>
 				<CallView v-if="isInCall"
@@ -45,6 +50,7 @@
 </template>
 
 <script>
+import ButtonVue from '@nextcloud/vue/dist/Components/Button'
 import PreventUnload from 'vue-prevent-unload'
 import { loadState } from '@nextcloud/initial-state'
 import CallView from './components/CallView/CallView.vue'
@@ -69,6 +75,7 @@ export default {
 	name: 'PublicShareSidebar',
 
 	components: {
+		ButtonVue,
 		CallButton,
 		CallView,
 		ChatView,
@@ -285,6 +292,7 @@ export default {
 	right: -5px;
 }
 
+#talk-sidebar .button-centered,
 #talk-sidebar .call-button {
 	/* Center button horizontally. */
 	margin-left: auto;
-- 
cgit v1.2.3


From 04527696ee21ddc755362eff14846046e525a2a9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 10 Aug 2022 14:33:43 +0200
Subject: Fix button height interference from server rules

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/PublicShareSidebar.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index a81191a15..919867ebf 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -302,6 +302,15 @@ export default {
 	margin-bottom: 10px;
 }
 
+#talk-sidebar .button-centered {
+	/*
+	 * When there is an icon the servers empty-content rule
+	 * .emptycontent [class*="icon-"] is matching button-vue--icon-and-text
+	 * setting the height to 64px, so we need to reset this.
+	 */
+	height: 44px;
+}
+
 #talk-sidebar #call-container {
 	position: relative;
 
-- 
cgit v1.2.3