coracle/flotilla
1
3
Fork 9
Code Issues 32 Pull Requests 1 Actions Packages Projects 5 Releases Wiki Activity

Fix merge artifacts

Browse Source
This commit is contained in:
mplorentz
2026-04-03 09:19:32 -04:00
parent b4b8f85e18
commit 3decff3cfc
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/VoiceCallAudioSettingsDialog.svelte
-3
View File
@@ -5,10 +5,7 @@
import ModalBody from "@lib/components/ModalBody.svelte" import ModalBody from "@lib/components/ModalBody.svelte"
import ModalFooter from "@lib/components/ModalFooter.svelte" import ModalFooter from "@lib/components/ModalFooter.svelte"
import ModalHeader from "@lib/components/ModalHeader.svelte" import ModalHeader from "@lib/components/ModalHeader.svelte"
<<<<<<< HEAD
import ModalSubtitle from "@lib/components/ModalSubtitle.svelte" import ModalSubtitle from "@lib/components/ModalSubtitle.svelte"
=======
>>>>>>> 462086da (Add settings button to configure audio devices in call)
import ModalTitle from "@lib/components/ModalTitle.svelte" import ModalTitle from "@lib/components/ModalTitle.svelte"
import { import {
currentVoiceSession, currentVoiceSession,
src/app/components/VoiceWidget.svelte
-5
View File
@@ -119,11 +119,6 @@
onclick={toggleCamera}> onclick={toggleCamera}>
<Icon icon={$currentVoiceSession.cameraOn ? VideocameraRecord : Videocamera} size={4} /> <Icon icon={$currentVoiceSession.cameraOn ? VideocameraRecord : Videocamera} size={4} />
</Button> </Button>
<Button>
data-tip="Audio settings" class="center tooltip tooltip-top btn btn-sm btn-square
btn-ghost" onclick={openAudioSettings}>
<Icon icon={Settings} size={4} />
</Button>
<Button <Button
data-tip={$currentVoiceSession.screenShareOn ? "Stop sharing" : "Share screen"} data-tip={$currentVoiceSession.screenShareOn ? "Stop sharing" : "Share screen"}
class="center tooltip tooltip-top btn btn-sm btn-square {$currentVoiceSession.screenShareOn class="center tooltip tooltip-top btn btn-sm btn-square {$currentVoiceSession.screenShareOn