Selaa lähdekoodia

fix(popups): covered by labels.

master
Hristo Terezov 4 vuotta sitten
vanhempi
commit
fec2641730

+ 1
- 1
css/_labels.scss Näytä tiedosto

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

+ 1
- 0
css/_popover.scss Näytä tiedosto

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

+ 1
- 1
css/_transcription-subtitles.scss Näytä tiedosto

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

+ 4
- 2
css/_variables.scss Näytä tiedosto

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

+ 0
- 8
css/_videolayout_default.scss Näytä tiedosto

480
     z-index: $reloadZ; /*The reload button should appear on top of the header!*/
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
 #dominantSpeaker {
483
 #dominantSpeaker {
492
     visibility: hidden;
484
     visibility: hidden;
493
     width: 300px;
485
     width: 300px;

+ 0
- 1
css/filmstrip/_horizontal_filmstrip.scss Näytä tiedosto

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

+ 1
- 2
css/filmstrip/_tile_view.scss Näytä tiedosto

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

+ 0
- 5
css/filmstrip/_tile_view_overrides.scss Näytä tiedosto

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

+ 2
- 6
css/modals/invite/_invite_more.scss Näytä tiedosto

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

+ 0
- 4
css/modals/video-quality/_video-quality.scss Näytä tiedosto

111
         display: none;
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 Näytä tiedosto

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

Loading…
Peruuta
Tallenna