Kaynağa Gözat

fix(popups): covered by labels.

master
Hristo Terezov 4 yıl önce
ebeveyn
işleme
fec2641730

+ 1
- 1
css/_labels.scss Dosyayı Görüntüle

@@ -4,7 +4,7 @@
4 4
     top: 30px;
5 5
     right: 30px;
6 6
     transition: right 0.5s;
7
-    z-index: $filmstripVideosZ + 1;
7
+    z-index: $labelsZ;
8 8
 
9 9
     .circular-label {
10 10
         align-items: center;

+ 1
- 0
css/_popover.scss Dosyayı Görüntüle

@@ -47,4 +47,5 @@
47 47
     border-radius: 3px;
48 48
     margin: -16px -24px;
49 49
     padding: 16px 24px;
50
+    z-index: $popoverZ;
50 51
 }

+ 1
- 1
css/_transcription-subtitles.scss Dosyayı Görüntüle

@@ -12,7 +12,7 @@
12 12
     1px 0px 1px rgba(0,0,0,0.3),
13 13
     0px 0px 1px rgba(0,0,0,0.3);
14 14
     transform: translateX(-50%);
15
-    z-index: $filmstripVideosZ + 1;
15
+    z-index: $subtitlesZ;
16 16
 
17 17
     span {
18 18
         background: black;

+ 4
- 2
css/_variables.scss Dosyayı Görüntüle

@@ -114,7 +114,10 @@ $zindex1: 1;
114 114
 $zindex2: 2;
115 115
 $zindex3: 3;
116 116
 $toolbarBackgroundZ: 4;
117
-$filmstripVideosZ: 5;
117
+$labelsZ: 5;
118
+$filmstripVideosZ: 6;
119
+$subtitlesZ: 7;
120
+$popoverZ: 8;
118 121
 $zindex10: 10;
119 122
 $reloadZ: 20;
120 123
 $poweredByZ: 100;
@@ -126,7 +129,6 @@ $tooltipsZ: 401;
126 129
 $dropdownMaskZ: 900;
127 130
 $dropdownZ: 901;
128 131
 $centeredVideoLabelZ: 1010;
129
-$popoverZ: 1015;
130 132
 $overlayZ: 1016;
131 133
 
132 134
 

+ 0
- 8
css/_videolayout_default.scss Dosyayı Görüntüle

@@ -480,14 +480,6 @@
480 480
     z-index: $reloadZ; /*The reload button should appear on top of the header!*/
481 481
 }
482 482
 
483
-.audiolevel {
484
-    display: inline-block;
485
-    position: absolute;
486
-    z-index: $zindex0;
487
-    border-radius:1px;
488
-    pointer-events: none;
489
-}
490
-
491 483
 #dominantSpeaker {
492 484
     visibility: hidden;
493 485
     width: 300px;

+ 0
- 1
css/filmstrip/_horizontal_filmstrip.scss Dosyayı Görüntüle

@@ -6,7 +6,6 @@
6 6
 }
7 7
 
8 8
 .horizontal-filmstrip .filmstrip {
9
-    position: absolute;
10 9
     bottom: 0;
11 10
     right: 0;
12 11
     padding: 10px 5px;

+ 1
- 2
css/filmstrip/_tile_view.scss Dosyayı Görüntüle

@@ -42,10 +42,9 @@
42 42
         height: 100%;
43 43
         justify-content: center;
44 44
         left: 0;
45
-        position: fixed;
45
+        position: absolute;
46 46
         top: 0;
47 47
         width: 100%;
48
-        z-index: $filmstripVideosZ;
49 48
 
50 49
         @media (min-width: 581px) {
51 50
             &.shift-right {

+ 0
- 5
css/filmstrip/_tile_view_overrides.scss Dosyayı Görüntüle

@@ -22,11 +22,6 @@
22 22
         display: none;
23 23
     }
24 24
 
25
-    #remoteConnectionMessage,
26
-    .watermark {
27
-        z-index: $filmstripVideosZ + 1;
28
-    }
29
-
30 25
     /**
31 26
      * The follow styling uses !important to override inline styles set with
32 27
      * javascript.

+ 2
- 6
css/modals/invite/_invite_more.scss Dosyayı Görüntüle

@@ -7,10 +7,6 @@
7 7
         text-align: center;
8 8
         z-index: $zindex2;
9 9
         background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
10
-
11
-        &.elevated {
12
-            z-index: $filmstripVideosZ + 1;
13
-        }
14 10
     }
15 11
 
16 12
     &-header {
@@ -98,11 +94,11 @@
98 94
                     border-radius: 4px;
99 95
                     cursor: pointer;
100 96
                 }
101
-    
97
+
102 98
                 &:hover > div:hover {
103 99
                     background-color: rgba(255, 255, 255, 0.2);
104 100
                 }
105
-    
101
+
106 102
                 & > :not(:last-child) {
107 103
                     margin-right: 16px;
108 104
                 }

+ 0
- 4
css/modals/video-quality/_video-quality.scss Dosyayı Görüntüle

@@ -111,7 +111,3 @@
111 111
         display: none;
112 112
     }
113 113
 }
114
-
115
-#videoResolutionLabel {
116
-    z-index: $zindex3 + 1;
117
-}

+ 1
- 9
react/features/conference/components/web/InviteMore.js Dosyayı Görüntüle

@@ -8,17 +8,11 @@ import { getParticipantCount } from '../../../base/participants';
8 8
 import { connect } from '../../../base/redux';
9 9
 import { beginAddPeople } from '../../../invite';
10 10
 import { isButtonEnabled, isToolboxVisible } from '../../../toolbox/functions.web';
11
-import { shouldDisplayTileView } from '../../../video-layout/functions';
12 11
 
13 12
 declare var interfaceConfig: Object;
14 13
 
15 14
 type Props = {
16 15
 
17
-    /**
18
-     * Whether tile view is enabled.
19
-     */
20
-    _tileViewEnabled: Boolean,
21
-
22 16
     /**
23 17
      * Whether to show the option to invite more people
24 18
      * instead of the subject.
@@ -44,14 +38,13 @@ type Props = {
44 38
  * @returns {React$Element<any>}
45 39
  */
46 40
 function InviteMore({
47
-    _tileViewEnabled,
48 41
     _visible,
49 42
     onClick,
50 43
     t
51 44
 }: Props) {
52 45
     return (
53 46
         _visible
54
-            ? <div className = { `invite-more-container${_tileViewEnabled ? ' elevated' : ''}` }>
47
+            ? <div className = 'invite-more-container'>
55 48
                 <div className = 'invite-more-header'>
56 49
                     {t('addPeople.inviteMoreHeader')}
57 50
                 </div>
@@ -81,7 +74,6 @@ function mapStateToProps(state) {
81 74
     const hide = interfaceConfig.HIDE_INVITE_MORE_HEADER;
82 75
 
83 76
     return {
84
-        _tileViewEnabled: shouldDisplayTileView(state),
85 77
         _visible: isToolboxVisible(state) && isButtonEnabled('invite') && isAlone && !hide
86 78
     };
87 79
 }

Loading…
İptal
Kaydet