Browse Source

Merge pull request #1096 from kkrisstoff/task/video-thumbnail-menu-should-appear-on-hover

show/hide video thumbnail menu on hover
j8
Дамян Минков 8 years ago
parent
commit
e5607d0371

+ 2
- 3
css/_jitsi_popover.scss View File

@@ -15,13 +15,12 @@
15 15
     /*box-shadow: 0 5px 10px rgba(0, 0, 0, 0.4);*/
16 16
     white-space: normal;
17 17
     margin-top: -10px;
18
-    margin-bottom: 35px;
19 18
 
20 19
     &__menu-padding {
21
-        height: 35px;
20
+        height: 10px;
22 21
         width: 100px;
23 22
         position: absolute;
24
-        bottom: -35px;
23
+        bottom: -10px;
25 24
     }
26 25
 
27 26
     &__showmore {

+ 17
- 5
css/_videolayout_default.scss View File

@@ -117,11 +117,23 @@
117 117
 /**
118 118
  * Hovered video thumbnail.
119 119
  */
120
-#remoteVideos .videocontainer:hover {
121
-    cursor: hand;
122
-    border: 2px solid $videoThumbnailHovered;
123
-    box-shadow: inset 0 0 3px $videoThumbnailHovered,
124
-              0 0 3px $videoThumbnailHovered;
120
+#remoteVideos .videocontainer {
121
+    .remotevideomenu {
122
+        display: none;
123
+    }
124
+
125
+    /**
126
+     * Show/hide items for hover event here
127
+     */
128
+    &:hover {
129
+        cursor: hand;
130
+        border: 2px solid $videoThumbnailHovered;
131
+        box-shadow: inset 0 0 3px $videoThumbnailHovered,
132
+            0 0 3px $videoThumbnailHovered;
133
+        .remotevideomenu {
134
+            display: inline-block;
135
+        }
136
+    }
125 137
 }
126 138
 
127 139
 #localVideoWrapper {

+ 2
- 1
modules/UI/util/JitsiPopover.js View File

@@ -53,7 +53,8 @@ var JitsiPopover = (function () {
53 53
             `<div class="jitsipopover ${this.options.skin}">
54 54
                 ${arrow}
55 55
                 <div class="jitsipopover__content"></div>
56
-            <div class="jitsipopover__menu-padding"></div></div>`
56
+                <div class="jitsipopover__menu-padding"></div>
57
+            </div>`
57 58
         );
58 59
     };
59 60
 

+ 2
- 2
modules/UI/videolayout/RemoteVideo.js View File

@@ -516,7 +516,7 @@ RemoteVideo.prototype.addRemoteStreamElement = function (stream) {
516 516
     }
517 517
 
518 518
     $(streamElement).click(onClickHandler);
519
-},
519
+};
520 520
 
521 521
 /**
522 522
  * Show/hide peer container for the given id.
@@ -629,7 +629,7 @@ RemoteVideo.prototype.removeRemoteVideoMenu = function() {
629 629
 RemoteVideo.createContainer = function (spanId) {
630 630
     let container = document.createElement('span');
631 631
     container.id = spanId;
632
-    container.className = 'videocontainer';
632
+    container.className = 'videocontainer videocontainer_remote';
633 633
 
634 634
     let wrapper = document.createElement('div');
635 635
     wrapper.className = 'videocontainer__background';

Loading…
Cancel
Save