haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into BeatC-BeatC-moving-conference-init-to-react-1

This commit is contained in:
Lyubomir Marinov 2017-01-10 13:07:19 -06:00
parent 2f01746c55 7ec5b34548
commit 4d5f82633b
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/_filmstrip.scss
View File

@ -50,14 +50,17 @@
position:relative; position:relative;
height:196px; height:196px;
padding: 0; padding: 0;
padding-left: 17px; /*The filmstrip should not be covered by the left toolbar*/
padding-left: $defaultToolbarSize + 5;
bottom: 0; bottom: 0;
width:auto; width:auto;
border: $thumbnailsBorder solid transparent; border: $thumbnailsBorder solid transparent;
z-index: 5; z-index: 5;
transition: bottom 2s; transition: bottom 2s;
overflow: visible !important; overflow: visible !important;
font-size: 0pt; /*!!!Removes the gap between the local video container and the remote videos.*/ /*!!!Removes the gap between the local video container and the remote
videos.*/
font-size: 0pt;
&.hidden { &.hidden {
bottom: -196px; bottom: -196px;
@ -67,8 +70,8 @@
display: none; display: none;
position: relative; position: relative;
background-size: contain; background-size: contain;
border: $thumbnailVideoBorder solid transparent; border: $thumbnailVideoBorder solid $thumbnailBorderColor;
border-radius:1px; border-radius: $borderRadius;
margin: 0 $thumbnailVideoMargin; margin: 0 $thumbnailVideoMargin;
&.videoContainerFocused, &:hover { &.videoContainerFocused, &:hover {
@ -112,7 +115,7 @@
& > video, & > video,
& > object { & > object {
cursor: hand; cursor: hand;
border-radius:1px; border-radius: $borderRadius;
object-fit: cover; object-fit: cover;
overflow: hidden; overflow: hidden;
} }

8
css/_variables.scss
View File

@ -14,9 +14,9 @@ $defaultToolbarSize: 50px;
// Video layout. // Video layout.
$thumbnailToolbarHeight: 22px; $thumbnailToolbarHeight: 22px;
$thumbnailIndicatorBorder: 0; $thumbnailIndicatorBorder: 2px;
$thumbnailIndicatorSize: 3em; $thumbnailIndicatorSize: $thumbnailToolbarHeight;
$thumbnailVideoMargin: 2px; $thumbnailVideoMargin: 5px;
$thumbnailsBorder: 2px; $thumbnailsBorder: 2px;
$thumbnailVideoBorder: 2px; $thumbnailVideoBorder: 2px;
$hideFilmstripButtonWidth: 17px; $hideFilmstripButtonWidth: 17px;
@ -95,7 +95,7 @@ $notificationWidth: 215px;
/** /**
* Misc. * Misc.
*/ */
$borderRadius: 3px; $borderRadius: 4px;
$defaultWatermarkLink: '../images/watermark.png'; $defaultWatermarkLink: '../images/watermark.png';
$sidebarWidth: 220px; $sidebarWidth: 220px;
$popoverMenuPadding: 13px; $popoverMenuPadding: 13px;

9
css/_videolayout_default.scss
View File

@ -18,9 +18,10 @@
&__background { &__background {
@include topLeft(); @include topLeft();
background-color: black;
border-radius: $borderRadius - 1;
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: black;
} }
/** /**
@ -106,11 +107,12 @@
} }
&__hoverOverlay { &__hoverOverlay {
background: rgba(0,0,0,.6);
border-radius: $borderRadius;
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
visibility: hidden; visibility: hidden;
background: rgba(0,0,0,.6);
z-index: 2; z-index: 2;
} }
} }
@ -128,8 +130,8 @@
#localVideoWrapper>video, #localVideoWrapper>video,
#localVideoWrapper>object { #localVideoWrapper>object {
border-radius: $borderRadius !important;
cursor: hand; cursor: hand;
border-radius:1px !important;
object-fit: cover; object-fit: cover;
} }
@ -211,6 +213,7 @@
.videocontainer .displayname { .videocontainer .displayname {
pointer-events: none; pointer-events: none;
padding: 0 3px 0 3px;
} }
.videocontainer .editdisplayname { .videocontainer .editdisplayname {

3
css/themes/_light.scss
View File

@ -85,6 +85,9 @@ $popupMenuSelectedItemBackground: rgba(256, 256, 256, .2);
// Toolbar // Toolbar
$splitterColor: #ccc; $splitterColor: #ccc;
// Thumbnail
$thumbnailBorderColor: rgba(71, 71, 71, .7);
/** /**
* Forms * Forms
*/ */