diff options
| author | Maksim Sukharev <antreesy.web@gmail.com> | 2023-02-23 13:16:35 +0100 |
|---|---|---|
| committer | Maksim Sukharev <antreesy.web@gmail.com> | 2023-02-23 13:16:35 +0100 |
| commit | 5598b6d4b184b219d14907f5b8538f55e85652a9 (patch) | |
| tree | 589e7f473efd86c9888ea15080fb69aa3d8a0fd3 | |
| parent | e66bd05eb7f68008a4241d7679f491b4b6c5da46 (diff) | |
resolve merge conflict
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
| -rw-r--r-- | src/components/TopBar/CallButton.vue | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/components/TopBar/CallButton.vue b/src/components/TopBar/CallButton.vue index 5e4329d89..c6b1f9519 100644 --- a/src/components/TopBar/CallButton.vue +++ b/src/components/TopBar/CallButton.vue @@ -80,23 +80,26 @@ </template> <script> +import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue' +import VideoIcon from 'vue-material-design-icons/Video.vue' +import VideoBoxOff from 'vue-material-design-icons/VideoBoxOff.vue' +import VideoOff from 'vue-material-design-icons/VideoOff.vue' + +import { emit } from '@nextcloud/event-bus' +import { loadState } from '@nextcloud/initial-state' + +import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js' +import NcActions from '@nextcloud/vue/dist/Components/NcActions.js' +import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' +import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js' + import { CALL, CONVERSATION, PARTICIPANT } from '../../constants.js' import browserCheck from '../../mixins/browserCheck.js' import isInCall from '../../mixins/isInCall.js' import isInLobby from '../../mixins/isInLobby.js' import participant from '../../mixins/participant.js' -import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js' -import { emit } from '@nextcloud/event-bus' -import { loadState } from '@nextcloud/initial-state' import BrowserStorage from '../../services/BrowserStorage.js' -import NcActions from '@nextcloud/vue/dist/Components/NcActions.js' -import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js' -import VideoBoxOff from 'vue-material-design-icons/VideoBoxOff.vue' -import VideoIcon from 'vue-material-design-icons/Video.vue' -import VideoOff from 'vue-material-design-icons/VideoOff.vue' -import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' import { EventBus } from '../../services/EventBus.js' -import ArrowLeft from 'vue-material-design-icons/ArrowLeft.vue' export default { name: 'CallButton', |