web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update the font-size when entering/leaving present mode

Browse Source
This commit is contained in:
yflory 2017-06-19 10:26:14 +02:00
parent 66d8c0ed11
commit 1df11f2813
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/slide/slide.css
View File

@ -89,7 +89,7 @@ body .CodeMirror-focused .cm-matchhighlight {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
} }
.preview .cp div#modal { .preview .cp div#modal:not(.shown) {
position: relative; position: relative;
top: auto; top: auto;
left: auto; left: auto;
@ -97,10 +97,10 @@ body .CodeMirror-focused .cm-matchhighlight {
display: block; display: block;
height: 100%; height: 100%;
} }
.preview .cp div#modal #content .slide-container { .preview .cp div#modal:not(.shown) #content .slide-container {
width: 100%; width: 100%;
} }
.preview .cp div#modal #content .slide-frame { .preview .cp div#modal:not(.shown) #content .slide-frame {
width: 50vw; width: 50vw;
height: 28.125vw; height: 28.125vw;
max-height: 100vh; max-height: 100vh;

5
www/slide/slide.js
View File

@ -38,7 +38,7 @@ define([
} }
}; };
var updateFontSize = Slide.updateFontSize = function() { var updateFontSize = Slide.updateFontSize = function () {
// 20vh // 20vh
// 20 * 16 / 9vw // 20 * 16 / 9vw
var wbase = 20; var wbase = 20;
@ -130,6 +130,7 @@ define([
$pad.addClass('fullscreen'); $pad.addClass('fullscreen');
$('#iframe-container').addClass('fullscreen'); $('#iframe-container').addClass('fullscreen');
$('.top-bar').hide(); $('.top-bar').hide();
updateFontSize();
return; return;
} }
window.location.hash = window.location.hash.replace(/\/present$/, '/'); window.location.hash = window.location.hash.replace(/\/present$/, '/');
@ -140,10 +141,10 @@ define([
$('#iframe-container').removeClass('fullscreen'); $('#iframe-container').removeClass('fullscreen');
$('.top-bar').show(); $('.top-bar').show();
$modal.removeClass('shown'); $modal.removeClass('shown');
updateFontSize();
}; };
Slide.update = function (content, init) { Slide.update = function (content, init) {
console.log(content, init);
updateFontSize(); updateFontSize();
//if (!init) { return; } //if (!init) { return; }
if (!content) { content = ''; } if (!content) { content = ''; }

2
www/slide/slide.less
View File

@ -97,7 +97,7 @@ body {
.preview .cp { .preview .cp {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
div#modal { div#modal:not(.shown) {
position: relative; position: relative;
top: auto; top: auto;
left: auto; left: auto;