Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco <marcoambrosini@icloud.com>2022-08-10 16:18:52 +0300
committerGitHub <noreply@github.com>2022-08-10 16:18:52 +0300
commit2654bd172b36e1dceb492408a2e94c1a3fe57cd7 (patch)
tree49c09f821fc3717dddd1d600140a19bb6e33df7c
parent81d91eef2dee835e1126241f59dbb4e0789aa480 (diff)
parent24cd820b8c6804f4165585aded7774cc4e6bae54 (diff)
Merge pull request #7696 from nextcloud/bugfix/noid/fix-matterbridge-buttons
Move matterbridge buttons to Vue
-rw-r--r--src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue22
1 files changed, 17 insertions, 5 deletions
diff --git a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
index 64387999b..621eab861 100644
--- a/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
+++ b/src/components/ConversationSettings/Matterbridge/MatterbridgeSettings.vue
@@ -35,7 +35,7 @@
<div class="basic-settings">
<div v-show="!enabled"
class="add-part-wrapper">
- <span class="icon icon-add" />
+ <Plus class="icon" size="20" />
<Multiselect ref="partMultiselect"
v-model="selectedType"
label="displayName"
@@ -64,10 +64,15 @@
{{ t('spreed', 'Enable bridge') }}
({{ processStateText }})
</label>
- <button v-if="enabled"
+ <ButtonVue v-if="enabled"
+ type="tertiary"
v-tooltip.top="{ content: t('spreed', 'Show Matterbridge log') }"
- class="icon icon-edit"
- @click="showLogContent" />
+ :aria-label="t('spreed', 'Show Matterbridge log')"
+ @click="showLogContent">
+ <template #icon>
+ <Message size="20" />
+ </template>
+ </ButtonVue>
<Modal v-if="logModal"
:container="container"
@close="closeLogModal">
@@ -100,8 +105,11 @@ import {
} from '../../../services/matterbridgeService.js'
import { showSuccess } from '@nextcloud/dialogs'
import { imagePath } from '@nextcloud/router'
+import ButtonVue from '@nextcloud/vue/dist/Components/Button'
import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
+import Message from 'vue-material-design-icons/Message'
import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Plus from 'vue-material-design-icons/Plus'
import BridgePart from './BridgePart.vue'
import Vue from 'vue'
@@ -113,7 +121,10 @@ export default {
components: {
Multiselect,
BridgePart,
+ ButtonVue,
+ Message,
Modal,
+ Plus,
},
mixins: [
@@ -699,7 +710,8 @@ export default {
display: inline-block;
width: 40px;
height: 34px;
- background-position: 14px center;
+ padding: 6px 10px 0;
+ vertical-align: middle;
}
.add-part-wrapper {
margin-top: 5px;