diff options
author | Maksim Sukharev <antreesy.web@gmail.com> | 2023-03-20 16:52:28 +0100 |
---|---|---|
committer | Maksim Sukharev <antreesy.web@gmail.com> | 2023-03-31 12:07:01 +0200 |
commit | 75c91369c13f93f7816143658c4b27ec5beaedb2 (patch) | |
tree | 95987e4d7566b83f83e6ae33c0ffd9abc9c2ef25 /src/components/CallView | |
parent | 9adbfcc3b52088cfc4c775a40f8616f700fc5cae (diff) |
remove redundant div wrapper and styles
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
Diffstat (limited to 'src/components/CallView')
-rw-r--r-- | src/components/CallView/shared/VideoBottomBar.vue | 57 |
1 files changed, 28 insertions, 29 deletions
diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue index e40fc3876..80e6f33d7 100644 --- a/src/components/CallView/shared/VideoBottomBar.vue +++ b/src/components/CallView/shared/VideoBottomBar.vue @@ -2,6 +2,7 @@ - @copyright Copyright (c) 2020 Marco Ambrosini <marcoambrosini@icloud.com> - - @author Marco Ambrosini <marcoambrosini@icloud.com> + - @author Maksim Sukharev <antreesy.web@gmail.com> - - @license GNU AGPL version 3 or any later version - @@ -26,6 +27,7 @@ <HandBackLeft :size="18" fill-color="#ffffff" /> </div> </transition> + <div v-if="!isSidebar" class="bottom-bar"> <transition name="fade"> <div v-show="showParticipantName" @@ -34,11 +36,11 @@ {{ participantName }} </div> </transition> - <transition name="fade"> - <div v-if="!isScreen" - v-show="showVideoOverlay" - class="bottom-bar__mediaIndicator"> + + <transition-group class="media-indicators" name="fade"> + <template v-if="!isScreen && showVideoOverlay"> <NcButton v-show="showAudioIndicator" + key="audioIndicator" v-tooltip="audioButtonTooltip" :aria-label="audioButtonTooltip" class="audioIndicator" @@ -52,6 +54,7 @@ </NcButton> <NcButton v-show="showVideoIndicator" + key="videoIndicator" v-tooltip="videoButtonTooltip" :aria-label="videoButtonTooltip" class="videoIndicator" @@ -64,6 +67,7 @@ </NcButton> <NcButton v-show="showScreenSharingIndicator" + key="screenSharingIndicator" v-tooltip="t('spreed', 'Show screen')" :aria-label="t('spreed', 'Show screen')" :class="screenSharingButtonClass" @@ -75,13 +79,15 @@ </NcButton> <div v-if="connectionStateFailedNoRestart" + key="iceFailedIndicator" class="iceFailedIndicator status-indicator"> <AlertCircle :size="20" fill-color="#ffffff" /> </div> - </div> - </transition> + </template> + </transition-group> + <NcButton v-if="showStopFollowingButton" - class="bottom-bar__button" + class="following-button" type="tertiary" @click="handleStopFollowing"> {{ t('spreed', 'Stop following') }} @@ -287,30 +293,36 @@ export default { .wrapper { display: flex; + align-items: center; position: absolute; bottom: 0; width: 100%; padding: 0 12px 8px 12px; - align-items: center; + z-index: 1; + &--big { justify-content: center; & .bottom-bar { - justify-content: center; - height: 48px; width: unset; } + & .participant-name { + margin-right: 0; + } } } .bottom-bar { display: flex; - width: 100%; - justify-content: space-between; align-items: center; - height: 40px; - z-index: 1; + gap: 8px; + width: 100%; + height: 44px; + + & .media-indicators { + display: flex; + } - & &__button { + & .following-button { opacity: 0.8; background-color: var(--color-background-dark); @@ -323,7 +335,7 @@ export default { .participant-name { color: white; - margin: 0 4px 0 8px; + margin: 0 auto 0 8px; position: relative; white-space: nowrap; overflow: hidden; @@ -343,19 +355,6 @@ export default { display: flex; align-items: center; justify-content: center; - } - &__mediaIndicator { - position: relative; - background-size: 22px; - text-align: center; - margin: 0 4px; - display: flex; - flex-wrap: nowrap; - } -} - -.handIndicator { - margin-top: 8px; } .iceFailedIndicator { |