瀏覽代碼

Fixes video thumbnail border and large video background color

master
yanas 8 年之前
父節點
當前提交
09ba14eb04
共有 3 個文件被更改,包括 20 次插入6 次删除
  1. 1
    1
      css/_filmstrip.scss
  2. 0
    3
      css/themes/_light.scss
  3. 19
    2
      modules/UI/videolayout/VideoContainer.js

+ 1
- 1
css/_filmstrip.scss 查看文件

70
             display: none;
70
             display: none;
71
             position: relative;
71
             position: relative;
72
             background-size: contain;
72
             background-size: contain;
73
-            border: $thumbnailVideoBorder solid $thumbnailBorderColor;
73
+            border: $thumbnailVideoBorder solid transparent;
74
             border-radius: $borderRadius;
74
             border-radius: $borderRadius;
75
             margin: 0 $thumbnailVideoMargin;
75
             margin: 0 $thumbnailVideoMargin;
76
 
76
 

+ 0
- 3
css/themes/_light.scss 查看文件

85
 // Toolbar
85
 // Toolbar
86
 $splitterColor: #ccc;
86
 $splitterColor: #ccc;
87
 
87
 
88
-// Thumbnail
89
-$thumbnailBorderColor: rgba(71, 71, 71, .7);
90
-
91
 /**
88
 /**
92
  * Forms
89
  * Forms
93
  */
90
  */

+ 19
- 2
modules/UI/videolayout/VideoContainer.js 查看文件

361
         this.$video.css({
361
         this.$video.css({
362
             transform: flipX ? 'scaleX(-1)' : 'none'
362
             transform: flipX ? 'scaleX(-1)' : 'none'
363
         });
363
         });
364
+
365
+        // Reset the large video background depending on the stream.
366
+        this.setLargeVideoBackground(this.avatarDisplayed);
364
     }
367
     }
365
 
368
 
366
     /**
369
     /**
395
         // default background set.
398
         // default background set.
396
         // In order to fix this code we need to introduce video background or
399
         // In order to fix this code we need to introduce video background or
397
         // find a workaround for the video flickering.
400
         // find a workaround for the video flickering.
398
-        $("#largeVideoContainer").css("background",
399
-            (show) ? interfaceConfig.DEFAULT_BACKGROUND : "#000");
401
+        this.setLargeVideoBackground(show);
400
 
402
 
401
         this.$avatar.css("visibility", show ? "visible" : "hidden");
403
         this.$avatar.css("visibility", show ? "visible" : "hidden");
402
         this.avatarDisplayed = show;
404
         this.avatarDisplayed = show;
465
     stayOnStage () {
467
     stayOnStage () {
466
         return false;
468
         return false;
467
     }
469
     }
470
+
471
+    /**
472
+     * Sets the large video container background depending on the container
473
+     * type and the parameter indicating if an avatar is currently shown on
474
+     * large.
475
+     *
476
+     * @param {boolean} isAvatar - Indicates if the avatar is currently shown
477
+     * on the large video.
478
+     * @returns {void}
479
+     */
480
+    setLargeVideoBackground (isAvatar) {
481
+        $("#largeVideoContainer").css("background",
482
+            (this.videoType === VIDEO_CONTAINER_TYPE && !isAvatar)
483
+                ? "#000" : interfaceConfig.DEFAULT_BACKGROUND);
484
+    }
468
 }
485
 }

Loading…
取消
儲存