diff options
| -rw-r--r-- | css/publicshareauth.scss | 10 | ||||
| -rw-r--r-- | css/video.scss | 1 | ||||
| -rw-r--r-- | js/publicshareauth.js | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/css/publicshareauth.scss b/css/publicshareauth.scss index 55f36da48..84e3294c3 100644 --- a/css/publicshareauth.scss +++ b/css/publicshareauth.scss @@ -91,11 +91,11 @@ input#request-password-button:disabled ~ .icon { margin-top: 10px; } -#talk-sidebar.incall #emptycontent { +#talk-sidebar #call-container.incall ~ #emptycontent { display: none; } -#talk-sidebar:not(.incall) #call-container { +#talk-sidebar #call-container:not(.incall) { display: none; } @@ -145,13 +145,13 @@ input#request-password-button:disabled ~ .icon { } /* Screensharing in Talk sidebar */ -#talk-sidebar.screensharing #videos .videoContainer video { +#talk-sidebar #call-container.screensharing #videos .videoContainer video { max-height: 200px; background-color: transparent; box-shadow: 0; } -#talk-sidebar.screensharing #screens { +#talk-sidebar #call-container.screensharing #screens { position: absolute; width: 100%; height: calc(100% - 200px); @@ -159,7 +159,7 @@ input#request-password-button:disabled ~ .icon { background-color: transparent; } -#talk-sidebar.screensharing .screenContainer { +#talk-sidebar #call-container.screensharing .screenContainer { position: relative; width: 100%; height: 100%; diff --git a/css/video.scss b/css/video.scss index ab5db97bb..ffa596c22 100644 --- a/css/video.scss +++ b/css/video.scss @@ -348,7 +348,6 @@ video { #app-content:not(.incall):not(.screensharing) .force-icon-white-in-call, -#talk-sidebar:not(.incall):not(.screensharing) .force-icon-white-in-call, #call-container:not(.incall):not(.screensharing) .force-icon-white-in-call { /* * Also force the white icons, when the video of the local participant is shown, diff --git a/js/publicshareauth.js b/js/publicshareauth.js index fe4a77ac3..bc448a1bb 100644 --- a/js/publicshareauth.js +++ b/js/publicshareauth.js @@ -63,12 +63,12 @@ $('#content').append($('footer')); $('body').append('<div id="talk-sidebar" class="disappear"></div>'); - $('#talk-sidebar').append('<div id="emptycontent"><div id="emptycontent-icon" class="icon-loading"></div><h2></h2><p class="emptycontent-additional"></p></div>'); $('#talk-sidebar').append('<div id="call-container"></div>'); + $('#talk-sidebar').append('<div id="emptycontent"><div id="emptycontent-icon" class="icon-loading"></div><h2></h2><p class="emptycontent-additional"></p></div>'); $('#call-container').append('<div id="videos"></div>'); $('#call-container').append('<div id="screens"></div>'); - OCA.SpreedMe.app.mainCallElementSelector = '#talk-sidebar'; + OCA.SpreedMe.app.mainCallElementSelector = '#call-container'; OCA.SpreedMe.app._emptyContentView.destroy(); OCA.SpreedMe.app._emptyContentView = new OCA.SpreedMe.Views.EmptyContentView({ |