diff options
author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2022-08-10 16:43:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-10 16:43:23 +0300 |
commit | 1dd5e6ac1a6ead3d0d85ca7c9dd8cc0187442d4d (patch) | |
tree | 9d1d087e1d80c6e504764906594a8bda59f99c7b /src | |
parent | 2654bd172b36e1dceb492408a2e94c1a3fe57cd7 (diff) | |
parent | 04527696ee21ddc755362eff14846046e525a2a9 (diff) |
Merge pull request #7694 from nextcloud/bugfix/noid/move-public-share-sidebar-to-vue-button
Move public share sidebar to vue button
Diffstat (limited to 'src')
-rw-r--r-- | src/PublicShareSidebar.vue | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue index 8b5afcda9..919867ebf 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; @@ -294,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; |