Ver código fonte

style: catalog all z-indexes and move toolbar down

All z-indexes found in css files have been moved into css
variables. If the z-index is used only once, the variable
name will be the same as the selector it is used in. If
the z-index is used multiple times, then the plain name
of $zindex# was used. This allowed a more confident
moving down of the toolbar so that the new modal dialog,
with z-index 500, could display on top of it.

#1436
j8
virtuacoplenny 8 anos atrás
pai
commit
2301732e2d

+ 2
- 2
css/_base.scss Ver arquivo

84
     height: 74px;
84
     height: 74px;
85
     background-size: contain;
85
     background-size: contain;
86
     background-repeat: no-repeat;
86
     background-repeat: no-repeat;
87
-    z-index: 2;
87
+    z-index: $zindex2;
88
 }
88
 }
89
 
89
 
90
 .leftwatermark {
90
 .leftwatermark {
106
     font-size: 11pt;
106
     font-size: 11pt;
107
     color: rgba(255,255,255,.50);
107
     color: rgba(255,255,255,.50);
108
     text-decoration: none;
108
     text-decoration: none;
109
-    z-index: 100;
109
+    z-index: $poweredByZ;
110
 }
110
 }
111
 
111
 
112
 .connected {
112
 .connected {

+ 2
- 2
css/_filmstrip.scss Ver arquivo

17
         flex-direction: column-reverse;
17
         flex-direction: column-reverse;
18
         flex-wrap: nowrap;
18
         flex-wrap: nowrap;
19
         position: relative;
19
         position: relative;
20
-        z-index: 1;                     // Set z-index to make element visible
20
+        z-index: $zindex1;              // Set z-index to make element visible
21
         width: $hideFilmstripButtonWidth;
21
         width: $hideFilmstripButtonWidth;
22
 
22
 
23
         button {
23
         button {
55
         bottom: 0;
55
         bottom: 0;
56
         width:auto;
56
         width:auto;
57
         border: $thumbnailsBorder solid transparent;
57
         border: $thumbnailsBorder solid transparent;
58
-        z-index: 5;
58
+        z-index: $filmstripVideosZ;
59
         transition: bottom 2s;
59
         transition: bottom 2s;
60
         overflow: visible !important;
60
         overflow: visible !important;
61
         /*!!!Removes the gap between the local video container and the remote
61
         /*!!!Removes the gap between the local video container and the remote

+ 1
- 1
css/_jitsi_popover.scss Ver arquivo

2
     position: absolute;
2
     position: absolute;
3
     top: 0;
3
     top: 0;
4
     left: 0;
4
     left: 0;
5
-    z-index: 1010;
5
+    z-index: $jitsipopoverZ;
6
     display: none;
6
     display: none;
7
     max-width: 300px;
7
     max-width: 300px;
8
     min-width: 100px;
8
     min-width: 100px;

+ 1
- 1
css/_jquery.contextMenu.scss Ver arquivo

143
   position: absolute;
143
   position: absolute;
144
   top: 50%;
144
   top: 50%;
145
   right: 8px;
145
   right: 8px;
146
-  z-index: 1; 
146
+  z-index: $zindex1;
147
   width: 0;
147
   width: 0;
148
   height: 0;
148
   height: 0;
149
   content: '';
149
   content: '';

+ 1
- 1
css/_keyboard-shortcuts.scss Ver arquivo

6
     overflow: hidden;
6
     overflow: hidden;
7
     padding: 20px;
7
     padding: 20px;
8
     margin-left: 10px;
8
     margin-left: 10px;
9
-    z-index: 10;
9
+    z-index: $zindex10;
10
     border-radius: $borderRadius;
10
     border-radius: $borderRadius;
11
     background-attachment: scroll;
11
     background-attachment: scroll;
12
     background-size: auto auto;
12
     background-size: auto auto;

+ 1
- 1
css/_notice.scss Ver arquivo

1
 .notice {
1
 .notice {
2
     position: relative;
2
     position: relative;
3
-    z-index: 3;
3
+    z-index: $zindex3;
4
     margin-top: 6px;
4
     margin-top: 6px;
5
 
5
 
6
     &__message {
6
     &__message {

+ 1
- 1
css/_popover.scss Ver arquivo

2
   position: absolute;
2
   position: absolute;
3
   top: 0;
3
   top: 0;
4
   left: 0;
4
   left: 0;
5
-  z-index: 1015;
5
+  z-index: $popoverZ;
6
   display: none;
6
   display: none;
7
   max-width: 300px;
7
   max-width: 300px;
8
   min-width: 100px;
8
   min-width: 100px;

+ 1
- 1
css/_side_toolbar_container.scss Ver arquivo

10
     position: absolute;
10
     position: absolute;
11
     top: 0;
11
     top: 0;
12
     width: 0;
12
     width: 0;
13
-    z-index: 800;
13
+    z-index: $sideToolbarContainerZ;
14
 
14
 
15
     /**
15
     /**
16
      * Labels inside the side panel.
16
      * Labels inside the side panel.

+ 2
- 2
css/_toolbars.scss Ver arquivo

33
 
33
 
34
 #subject {
34
 #subject {
35
     position: relative;
35
     position: relative;
36
-    z-index: 3;
36
+    z-index: $zindex3;
37
     width: auto;
37
     width: auto;
38
     padding: 5px;
38
     padding: 5px;
39
     margin-left: 40%;
39
     margin-left: 40%;
106
     height: 50px;
106
     height: 50px;
107
     cursor: pointer;
107
     cursor: pointer;
108
     text-align: center;
108
     text-align: center;
109
-    z-index: 1;
109
+    z-index: $zindex1;
110
     font-size: $toolbarFontSize !important;
110
     font-size: $toolbarFontSize !important;
111
     line-height: 50px !important;
111
     line-height: 50px !important;
112
     vertical-align: middle;
112
     vertical-align: middle;

+ 18
- 5
css/_variables.scss Ver arquivo

104
 /**
104
 /**
105
  * Z-indexes. TODO: Replace this by a function.
105
  * Z-indexes. TODO: Replace this by a function.
106
  */
106
  */
107
-$tooltipsZ: 901;
108
-$toolbarZ: 900;
107
+$zindex0: 0;
108
+$zindex1: 1;
109
+$zindex2: 2;
110
+$zindex3: 3;
111
+$filmstripVideosZ: 5;
112
+$zindex10: 10;
113
+$reloadZ: 20;
114
+$poweredByZ: 100;
115
+$ringingZ: 300;
116
+$sideToolbarContainerZ: 300;
117
+$toolbarZ: 400;
118
+$tooltipsZ: 401;
119
+$dropdownMaskZ: 900;
120
+$dropdownZ: 901;
109
 $overlayZ: 902;
121
 $overlayZ: 902;
122
+$jitsipopoverZ: 1010;
123
+$centeredVideoLabelZ: 1011;
110
 $notificationZ: 1012;
124
 $notificationZ: 1012;
111
-$ringingZ: 800;
112
-$dropdownZ: 901;
113
-$dropdownMaskZ: 900;
125
+$popoverZ: 1015;
126
+
114
 
127
 
115
 /**
128
 /**
116
  * Font Colors
129
  * Font Colors

+ 16
- 16
css/_videolayout_default.scss Ver arquivo

31
     &__toptoolbar {
31
     &__toptoolbar {
32
         position: absolute;
32
         position: absolute;
33
         left: 0;
33
         left: 0;
34
-        z-index: 3;
34
+        z-index: $zindex3;
35
         width: 100%;
35
         width: 100%;
36
         box-sizing: border-box; // Includes the padding in the 100% width.
36
         box-sizing: border-box; // Includes the padding in the 100% width.
37
     }
37
     }
59
             float: left;
59
             float: left;
60
             @include circle($thumbnailIndicatorSize);
60
             @include circle($thumbnailIndicatorSize);
61
             box-sizing: border-box;
61
             box-sizing: border-box;
62
-            z-index: 3;
62
+            z-index: $zindex3;
63
             background: $dominantSpeakerBg;
63
             background: $dominantSpeakerBg;
64
             color: $thumbnailPictogramColor;
64
             color: $thumbnailPictogramColor;
65
             border: $thumbnailIndicatorBorder solid $thumbnailPictogramColor;
65
             border: $thumbnailIndicatorBorder solid $thumbnailPictogramColor;
113
         width: 100%;
113
         width: 100%;
114
         height: 100%;
114
         height: 100%;
115
         visibility: hidden;
115
         visibility: hidden;
116
-        z-index: 2;
116
+        z-index: $zindex2;
117
     }
117
     }
118
 }
118
 }
119
 
119
 
161
     position: absolute;
161
     position: absolute;
162
     left: 0;
162
     left: 0;
163
     top: 0;
163
     top: 0;
164
-    z-index: 1;
164
+    z-index: $zindex1;
165
     width: 100%;
165
     width: 100%;
166
     height: 100%;
166
     height: 100%;
167
 }
167
 }
171
 }
171
 }
172
 
172
 
173
 #etherpad {
173
 #etherpad {
174
-    z-index: 0;
174
+    z-index: $zindex0;
175
 }
175
 }
176
 
176
 
177
 /**
177
 /**
193
     overflow: hidden;
193
     overflow: hidden;
194
     white-space: nowrap;
194
     white-space: nowrap;
195
     line-height: $thumbnailToolbarHeight;
195
     line-height: $thumbnailToolbarHeight;
196
-    z-index: 2;
196
+    z-index: $zindex2;
197
 }
197
 }
198
 
198
 
199
 /**
199
 /**
233
     padding: 3px 5px;
233
     padding: 3px 5px;
234
     font-size: 9pt;
234
     font-size: 9pt;
235
     cursor: pointer;
235
     cursor: pointer;
236
-    z-index: 2;
236
+    z-index: $zindex2;
237
 }
237
 }
238
 
238
 
239
 /**
239
 /**
283
     top: 0px;
283
     top: 0px;
284
     right: 0;
284
     right: 0;
285
     margin: 7px;
285
     margin: 7px;
286
-    z-index: 3;
286
+    z-index: $zindex3;
287
     width: 18px;
287
     width: 18px;
288
     height: 13px;
288
     height: 13px;
289
     color: #FFF;
289
     color: #FFF;
301
     margin-top: -17px;
301
     margin-top: -17px;
302
     width: 6px;
302
     width: 6px;
303
     height: 35px;
303
     height: 35px;
304
-    z-index: 2;
304
+    z-index: $zindex2;
305
     border: none;
305
     border: none;
306
 
306
 
307
     .audiodot-top,
307
     .audiodot-top,
344
     background-clip: padding-box;
344
     background-clip: padding-box;
345
     -webkit-border-radius: 5px;
345
     -webkit-border-radius: 5px;
346
     -webkit-background-clip: padding-box;
346
     -webkit-background-clip: padding-box;
347
-    z-index: 20; /*The reload button should appear on top of the header!*/
347
+    z-index: $reloadZ; /*The reload button should appear on top of the header!*/
348
 }
348
 }
349
 
349
 
350
 .audiolevel {
350
 .audiolevel {
351
     display: inline-block;
351
     display: inline-block;
352
     position: absolute;
352
     position: absolute;
353
-    z-index: 0;
353
+    z-index: $zindex0;
354
     border-radius:1px;
354
     border-radius:1px;
355
     pointer-events: none;
355
     pointer-events: none;
356
 }
356
 }
408
 .noMic {
408
 .noMic {
409
     position: absolute;
409
     position: absolute;
410
     border-radius: 8px;
410
     border-radius: 8px;
411
-    z-index: 1;
411
+    z-index: $zindex1;
412
     width: 100%;
412
     width: 100%;
413
     height: 100%;
413
     height: 100%;
414
     background-image: url("../images/noMic.png");
414
     background-image: url("../images/noMic.png");
420
 .noVideo {
420
 .noVideo {
421
     position: absolute;
421
     position: absolute;
422
     border-radius: 8px;
422
     border-radius: 8px;
423
-    z-index: 1;
423
+    z-index: $zindex1;
424
     width: 100%;
424
     width: 100%;
425
     height: 100%;
425
     height: 100%;
426
     background-image: url("../images/noVideo.png");
426
     background-image: url("../images/noVideo.png");
453
     display: none;
453
     display: none;
454
     position: absolute;
454
     position: absolute;
455
     width: auto;
455
     width: auto;
456
-    z-index: 2;
456
+    z-index: $zindex2;
457
     font-weight: 600;
457
     font-weight: 600;
458
     font-size: 14px;
458
     font-size: 14px;
459
     text-align: center;
459
     text-align: center;
477
     left: 0;
477
     left: 0;
478
     width: 100%;
478
     width: 100%;
479
     top:50%;
479
     top:50%;
480
-    z-index: 2;
480
+    z-index: $zindex2;
481
     font-weight: 600;
481
     font-weight: 600;
482
     font-size: 14px;
482
     font-size: 14px;
483
     text-align: center;
483
     text-align: center;
506
 #videoResolutionLabel,
506
 #videoResolutionLabel,
507
 .centeredVideoLabel {
507
 .centeredVideoLabel {
508
     display: none;
508
     display: none;
509
-    z-index: 1011;
509
+    z-index: $centeredVideoLabelZ;
510
 }
510
 }
511
 
511
 
512
 .centeredVideoLabel {
512
 .centeredVideoLabel {

+ 5
- 5
css/_welcome_page.scss Ver arquivo

22
     font-weight: 500;
22
     font-weight: 500;
23
     font-size: 16px;
23
     font-size: 16px;
24
     color: #acacac;
24
     color: #acacac;
25
-    z-index: 2;
25
+    z-index: $zindex2;
26
 }
26
 }
27
 
27
 
28
 #disable_welcome:checked + label
28
 #disable_welcome:checked + label
35
     font-weight: 500;
35
     font-weight: 500;
36
     font-size: 16px;
36
     font-size: 16px;
37
     color: #acacac;
37
     color: #acacac;
38
-    z-index: 2;
38
+    z-index: $zindex2;
39
 }
39
 }
40
 
40
 
41
 #enter_room_form {
41
 #enter_room_form {
74
         float: left;
74
         float: left;
75
         background-color: #FFFFFF;
75
         background-color: #FFFFFF;
76
         position: relative;
76
         position: relative;
77
-        z-index: 2;
77
+        z-index: $zindex2;
78
     }
78
     }
79
 
79
 
80
     &__reload {
80
     &__reload {
83
         color: #acacac;
83
         color: #acacac;
84
         font-size: 1.9em;
84
         font-size: 1.9em;
85
         line-height: 55px;
85
         line-height: 55px;
86
-        z-index: 3;
86
+        z-index: $zindex3;
87
         float:  left;
87
         float:  left;
88
         cursor: pointer;
88
         cursor: pointer;
89
         text-align: center;
89
         text-align: center;
104
         outline: none;
104
         outline: none;
105
         float:left;
105
         float:left;
106
         position: relative;
106
         position: relative;
107
-        z-index: 2;
107
+        z-index: $zindex2;
108
     }
108
     }
109
 }
109
 }
110
 
110
 

Carregando…
Cancelar
Salvar