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@pm.me>2022-01-12 15:14:34 +0300
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2022-01-12 16:40:04 +0300
commita6498d07dbd24c9d8774d265529dbba8e9b948c7 (patch)
treea6daa10aa5fd79b46768a53e7cfaa32f5f2129fb
parent36381872b1a5bebc5079247962ea401baab2e2e3 (diff)
Fix bottom-bar buttons placementbackport/6648/stable23
Signed-off-by: marco <marcoambrosini@pm.me>
-rw-r--r--src/components/CallView/shared/VideoBottomBar.vue49
1 files changed, 32 insertions, 17 deletions
diff --git a/src/components/CallView/shared/VideoBottomBar.vue b/src/components/CallView/shared/VideoBottomBar.vue
index b0faefce3..3e921b75c 100644
--- a/src/components/CallView/shared/VideoBottomBar.vue
+++ b/src/components/CallView/shared/VideoBottomBar.vue
@@ -20,22 +20,24 @@
-->
<template>
- <div>
+ <div class="wrapper"
+ :class="{'wrapper--big': isBig}">
+ <transition name="fade">
+ <div
+ v-if="!connectionStateFailedNoRestart && model.attributes.raisedHand.state"
+ class="bottom-bar__statusIndicator">
+ <HandBackLeft
+ class="handIndicator"
+ decorative
+ title=""
+ size="18px"
+ fill-color="#ffffff" />
+ </div>
+ </transition>
<div v-if="!isSidebar"
class="bottom-bar"
:class="{'bottom-bar--video-on' : hasShadow, 'bottom-bar--big': isBig }">
<transition name="fade">
- <div
- v-if="!connectionStateFailedNoRestart && model.attributes.raisedHand.state"
- class="bottom-bar__statusIndicator">
- <HandBackLeft
- class="handIndicator"
- decorative
- title=""
- fill-color="#ffffff" />
- </div>
- </transition>
- <transition name="fade">
<div v-show="showNameIndicator"
class="bottom-bar__nameIndicator"
:class="{'bottom-bar__nameIndicator--promoted': boldenNameIndicator}">
@@ -286,12 +288,21 @@ export default {
@import '../../../assets/variables.scss';
-.bottom-bar {
+.wrapper {
+ display: flex;
position: absolute;
bottom: 0;
width: 100%;
- padding: 0 0px 12px 16px;
+ padding: 0 12px 8px 12px;
+ align-items: center;
+ &--big {
+ justify-content: center;
+ }
+}
+
+.bottom-bar {
display: flex;
+ width: 100%;
justify-content: space-between;
align-items: center;
height: 40px;
@@ -299,13 +310,14 @@ export default {
&--big {
justify-content: center;
height: 48px;
+ width: unset;
}
&--video-on {
text-shadow: 0 0 4px rgba(0, 0, 0,.8);
}
&__nameIndicator {
color: white;
- margin-right: 4px;
+ margin: 0 4px 0 8px;
position: relative;
white-space: nowrap;
overflow: hidden;
@@ -316,8 +328,11 @@ export default {
}
}
&__statusIndicator {
- margin-left: 6px;
- margin-right: 6px;
+ width: 44px;
+ height: 44px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
}
&__mediaIndicator {
position: relative;