Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/components/CallView/Grid/Grid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,9 @@
@click="handleClickStripeCollapse">
<ChevronDown v-if="stripeOpen"
fill-color="#ffffff"
decorative
title=""
:size="20" />
<ChevronUp v-else
fill-color="#ffffff"
decorative
title=""
:size="20" />
</button>
<transition :name="isStripe ? 'slide-down' : ''">
Expand All @@ -44,9 +40,7 @@
class="grid-navigation grid-navigation__previous"
:aria-label="t('spreed', 'Previous page of videos')"
@click="handleClickPrevious">
<ChevronLeft decorative
fill-color="#ffffff"
title=""
<ChevronLeft fill-color="#ffffff"
:size="20" />
</button>
<div ref="grid"
Expand Down Expand Up @@ -110,9 +104,7 @@
:class="{'stripe': isStripe}"
:aria-label="t('spreed', 'Next page of videos')"
@click="handleClickNext">
<ChevronRight decorative
fill-color="#ffffff"
title=""
<ChevronRight fill-color="#ffffff"
:size="20" />
</button>
</div>
Expand Down
73 changes: 18 additions & 55 deletions src/components/CallView/shared/LocalMediaControls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@
:open="showQualityWarningTooltip">
<button slot="trigger"
class="trigger">
<NetworkStrength2Alert decorative
fill-color="#e9322d"
title=""
<NetworkStrength2Alert fill-color="#e9322d"
:size="20"
@mouseover="mouseover = true"
@mouseleave="mouseover = false" />
Expand Down Expand Up @@ -64,14 +62,10 @@
@click.stop="toggleAudio">
<Microphone v-if="showMicrophoneOn"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
<MicrophoneOff v-else
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
</button>
<span v-show="model.attributes.audioAvailable"
ref="volumeIndicator"
Expand All @@ -87,14 +81,10 @@
@click.stop="toggleVideo">
<VideoIcon v-if="showVideoOn"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
<VideoOff v-else
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
</button>
<button v-if="isVirtualBackgroundAvailable && !showActions"
v-tooltip="toggleVirtualBackgroundButtonLabel"
Expand All @@ -103,14 +93,10 @@
@click.stop="toggleVirtualBackground">
<Blur v-if="isVirtualBackgroundEnabled"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
<BlurOff v-else
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
</button>
<Actions v-if="!screenSharingButtonHidden"
id="screensharing-button"
Expand All @@ -127,40 +113,30 @@
<CancelPresentation v-if="model.attributes.localScreen"
slot="icon"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
<PresentToAll v-else
slot="icon"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
<!-- /Actions button icon -->
<!-- Actions -->
<ActionButton v-if="!screenSharingMenuOpen"
@click.stop="toggleScreenSharingMenu">
<PresentToAll slot="icon"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
{{ screenSharingButtonTooltip }}
</ActionButton>
<ActionButton v-if="model.attributes.localScreen"
@click="showScreen">
<Monitor slot="icon"
:size="20"
title=""
decorative />
:size="20" />
{{ t('spreed', 'Show your screen') }}
</ActionButton>
<ActionButton v-if="model.attributes.localScreen"
@click="stopScreen">
<CancelPresentation slot="icon"
:size="20"
title=""
decorative />
:size="20" />
{{ t('spreed', 'Stop screensharing') }}
</ActionButton>
</Actions>
Expand All @@ -174,9 +150,7 @@
@click.stop="toggleHandRaised">
<!-- The following icon is much bigger than all the others
so we reduce its size -->
<HandBackLeft decorative
title=""
:size="18"
<HandBackLeft :size="18"
fill-color="#ffffff" />
</button>
<Actions v-if="showActions"
Expand All @@ -185,16 +159,13 @@
:aria-label="t('spreed', 'More actions')">
<DotsHorizontal slot="icon"
:size="20"
decorative
fill-color="#ffffff" />

<ActionButton :close-after-click="true"
@click="toggleHandRaised">
<!-- The following icon is much bigger than all the others
so we reduce its size -->
<HandBackLeft slot="icon"
decorative
title=""
:size="18" />
{{ raiseHandButtonLabel }}
</ActionButton>
Expand All @@ -203,14 +174,10 @@
@click="toggleVirtualBackground">
<BlurOff v-if="isVirtualBackgroundEnabled"
slot="icon"
:size="20"
decorative
title="" />
:size="20" />
<Blur v-else
slot="icon"
:size="20"
decorative
title="" />
:size="20" />
{{ toggleVirtualBackgroundButtonLabel }}
</ActionButton>
<!-- Call layout switcher -->
Expand All @@ -219,21 +186,17 @@
@click="changeView">
<GridView v-if="isGrid"
slot="icon"
:size="20"
decorative />
:size="20" />
<PromotedView v-else
slot="icon"
:size="20"
decorative />
:size="20" />
{{ changeViewText }}
</ActionButton>
<ActionSeparator />
<ActionButton :close-after-click="true"
@click="showSettings">
<Cog slot="icon"
decorative
:size="20"
title="" />
:size="20" />
{{ t('spreed', 'Devices settings') }}
</ActionButton>
</Actions>
Expand Down
2 changes: 0 additions & 2 deletions src/components/CallView/shared/Video.vue
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,6 @@
:key="'placeholderForPromoted'"
class="placeholder-for-promoted">
<AccountCircle v-if="isPromoted || isSelected"
decorative
title=""
fill-color="#FFFFFF"
:size="36" />
</div>
Expand Down
26 changes: 6 additions & 20 deletions src/components/CallView/shared/VideoBottomBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@
<div v-if="!connectionStateFailedNoRestart && model.attributes.raisedHand.state"
class="bottom-bar__statusIndicator">
<HandBackLeft class="handIndicator"
decorative
title=""
size="18px"
fill-color="#ffffff" />
</div>
Expand All @@ -54,48 +52,36 @@
@click.stop="forceMute">
<Microphone v-if="showMicrophone"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
<MicrophoneOff v-if="showMicrophoneOff"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
</button>
<button v-show="!connectionStateFailedNoRestart && model.attributes.videoAvailable"
v-tooltip="videoButtonTooltip"
class="hideRemoteVideo"
@click.stop="toggleVideo">
<VideoIcon v-if="showVideoButton"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
<VideoOff v-if="!showVideoButton"
:size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
</button>
<button v-show="!connectionStateFailedNoRestart"
v-tooltip="t('spreed', 'Show screen')"
class="screensharingIndicator"
:class="screenSharingButtonClass"
@click.stop="switchToScreen">
<Monitor :size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
</button>
<button v-show="connectionStateFailedNoRestart"
class="iceFailedIndicator"
:class="{ 'not-failed': !connectionStateFailedNoRestart }"
disabled="true">
<AlertCircle :size="20"
title=""
fill-color="#ffffff"
decorative />
fill-color="#ffffff" />
</button>
</div>
</transition>
Expand Down
12 changes: 4 additions & 8 deletions src/components/ConversationIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,14 @@
class="conversation-icon__avatar" />
<div v-if="showCall"
class="overlap-icon">
<Video decorative
:size="20"
:fill-color="'#E9322D'"
title="" />
<Video :size="20"
:fill-color="'#E9322D'" />
<span class="hidden-visually">{{ t('spreed', 'Call in progress') }}</span>
</div>
<div v-else-if="showFavorite"
class="overlap-icon">
<Star decorative
:size="20"
:fill-color="'#FFCC00'"
title="" />
<Star :size="20"
:fill-color="'#FFCC00'" />
<span class="hidden-visually">{{ t('spreed', 'Favorite') }}</span>
</div>
</div>
Expand Down
12 changes: 3 additions & 9 deletions src/components/Description/Description.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,15 @@
:aria-label="t('spreed', 'Cancel editing description')"
@click="handleCancelEditing">
<template #icon>
<Close decorative
title=""
:size="20" />
<Close :size="20" />
</template>
</Button>
<Button type="primary"
:aria-label="t('spreed', 'Submit conversation description')"
:disabled="!canSubmit"
@click="handleSubmitDescription">
<template #icon>
<Check decorative
title=""
:size="20" />
<Check :size="20" />
</template>
</Button>
<div v-if="showCountDown"
Expand All @@ -67,9 +63,7 @@
:aria-label="t('spreed', 'Edit conversation description')"
@click="handleEditDescription">
<template #icon>
<Pencil decorative
title=""
:size="20" />
<Pencil :size="20" />
</template>
</Button>
</template>
Expand Down
20 changes: 3 additions & 17 deletions src/components/DeviceChecker/DeviceChecker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,8 @@
@click="toggleAudio">
<template #icon>
<Microphone v-if="audioOn"
title=""
decorative
:size="20" />
<MicrophoneOff v-else
title=""
decorative
:size="20" />
</template>
</Button>
Expand All @@ -90,12 +86,8 @@
@click="toggleVideo">
<template #icon>
<Video v-if="videoOn"
title=""
decorative
:size="20" />
<VideoOff v-else
title=""
decorative
:size="20" />
</template>
</Button>
Expand All @@ -109,13 +101,9 @@
@click="toggleBlur">
<template #icon>
<Blur v-if="blurOn"
:size="20"
decorative
title="" />
:size="20" />
<BlurOff v-else
:size="20"
decorative
title="" />
:size="20" />
</template>
</Button>
</div>
Expand All @@ -127,9 +115,7 @@
class="select-devices"
@click="showDeviceSelection = true">
<template #icon>
<Cog title=""
decorative
:size="20" />
<Cog :size="20" />
</template>
{{ t('spreed', 'Choose devices') }}
</Button>
Expand Down
Loading