Browse Source

Merge pull request #914 from jitsi/fix_toolbar_ringoverlay

fix(toolbar): Issue with toolbar is positioned under the ring overlay
j8
yanas 8 years ago
parent
commit
4db8faa526
4 changed files with 5 additions and 8 deletions
  1. 2
    1
      css/_base.scss
  2. 2
    1
      css/_variables.scss
  3. 0
    5
      css/_videolayout_default.scss
  4. 1
    1
      index.html

+ 2
- 1
css/_base.scss View File

169
 }
169
 }
170
 
170
 
171
 .tipsy {
171
 .tipsy {
172
+    z-index: $tooltipsZ;
172
     &-inner {
173
     &-inner {
173
         background-color: $tooltipBg;
174
         background-color: $tooltipBg;
174
     }
175
     }
176
     &-arrow {
177
     &-arrow {
177
         border-color: $tooltipBg;
178
         border-color: $tooltipBg;
178
     }
179
     }
179
-}
180
+}

+ 2
- 1
css/_variables.scss View File

60
 /**
60
 /**
61
  * Z-indexes. TODO: Replace this by a function.
61
  * Z-indexes. TODO: Replace this by a function.
62
  */
62
  */
63
+$tooltipsZ: 901;
63
 $toolbarZ: 900;
64
 $toolbarZ: 900;
64
 $overlayZ: 800;
65
 $overlayZ: 800;
65
 
66
 
72
 $buttonFontColor: #777;
73
 $buttonFontColor: #777;
73
 $buttonHoverFontColor: #287ade;
74
 $buttonHoverFontColor: #287ade;
74
 $linkFontColor: #489afe;
75
 $linkFontColor: #489afe;
75
-$linkHoverFontColor: #287ade;
76
+$linkHoverFontColor: #287ade;

+ 0
- 5
css/_videolayout_default.scss View File

1
-.video-wrapper {
2
-    position: relative;
3
-    z-index: 1;
4
-}
5
-
6
 #videospace {
1
 #videospace {
7
     display: block;
2
     display: block;
8
     position: absolute;
3
     position: absolute;

+ 1
- 1
index.html View File

95
         </div>
95
         </div>
96
         <!--#include virtual="plugin.welcomepage.footer.html" -->
96
         <!--#include virtual="plugin.welcomepage.footer.html" -->
97
     </div>
97
     </div>
98
-    <div id="videoconference_page" class="video-wrapper">
98
+    <div id="videoconference_page">
99
         <div id="mainToolbarContainer">
99
         <div id="mainToolbarContainer">
100
                 <div id="notice" class="notice" style="display: none">
100
                 <div id="notice" class="notice" style="display: none">
101
                     <span id="noticeText" class="noticeText"></span>
101
                     <span id="noticeText" class="noticeText"></span>

Loading…
Cancel
Save