infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Uniform the slides rendering in present and print mode

Browse Source
pull/1/head
yflory 8 years ago
parent 2add39ee40
commit a5f11d0d0d
4 changed files with 319 additions and 316 deletions
Show Stats Download Patch File Download Diff File

7
customize.dist/src/less/mixins.less
Unescape Escape View File

@ -23,8 +23,11 @@
.top-left(@s: 5px) { border-top-left-radius: @s; } .top-left(@s: 5px) { border-top-left-radius: @s; }
.size (@n) { .size (@n) {
font-size: @n * 1vw; // font-size: @n * 1vmin;
line-height: @n * 1.1vw; // line-height: @n * 1.1vmin;
font-size: @n * 10%;
// line-height: @n * 11%;
line-height: 110%;
} }
.two-part-gradient (@start, @end) { .two-part-gradient (@start, @end) {

11
www/slide/main.js
Unescape Escape View File

@ -137,6 +137,17 @@ define([
var $modal = $pad.contents().find('#modal'); var $modal = $pad.contents().find('#modal');
var $content = $pad.contents().find('#content'); var $content = $pad.contents().find('#content');
var $print = $pad.contents().find('#print'); var $print = $pad.contents().find('#print');
$( window ).resize(function() {
// 20vh
// 20 * 16 / 9vw
if ($(window).width() > 16/9*$(window).height()) {
$content.css('font-size', '20vh');
// $print.css('font-size', '20vh');
return;
}
$content.css('font-size', (20*9/16)+'vw');
// $print.css('font-size', (20*9/16)+'vw');
});
Slide.setModal($modal, $content, $pad, ifrw, initialState); Slide.setModal($modal, $content, $pad, ifrw, initialState);

343
www/slide/slide.css
Unescape Escape View File

@ -44,7 +44,7 @@ body .CodeMirror-focused .cm-matchhighlight {
@media print { @media print {
@page { @page {
margin: 0; margin: 0;
size: auto; size: landscape;
} }
body { body {
display: block; display: block;
@ -63,86 +63,106 @@ body .CodeMirror-focused .cm-matchhighlight {
max-height: none; max-height: none;
overflow: visible; overflow: visible;
} }
html #print { html .cp #print {
display: block; display: block;
visibility: visible; visibility: visible;
} }
html #print * { html .cp #print * {
visibility: visible; visibility: visible;
} }
} }
#print { .cp {
/* Slide position (print mode) */
/* Slide position (present mode) */
/* Slide content */
}
.cp #print {
position: relative; position: relative;
display: none; display: none;
font-size: 11.25vw;
} }
#print .slide-frame { .cp #print .slide-frame {
display: flex !important; display: block !important;
justify-content: center; padding: 2.5%;
align-items: center; margin-top: calc((100vh - 56.25vw)/2);
flex-flow: column; border-top: 1px solid black;
padding: 5vh 0; border-bottom: 1px solid black;
height: 100vh; height: 56.25vw;
width: 100%; width: 100vw;
page-break-after: always; page-break-after: always;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
} }
#print .slide-frame li { .cp #print .slide-frame li {
min-width: 50vw; min-width: 50vw;
} }
#print .slide-frame h1 { .cp #print .slide-frame h1 {
padding-top: 0; padding-top: 0;
} }
#print .slide-frame .slideNumber { .cp #print .slide-frame .slideNumber {
position: absolute; position: absolute;
right: 5vh; right: 5vh;
bottom: 5vh; bottom: 5vh;
font-size: 15px;
} }
#print .slide-frame .slideDate { .cp #print .slide-frame .slideDate {
position: absolute; position: absolute;
left: 5vh; left: 5vh;
bottom: 5vh; bottom: 5vh;
font-size: 15px;
} }
#print .slide-frame .slideTitle { .cp #print .slide-frame .slideTitle {
position: absolute; position: absolute;
top: 5vh; top: 5vh;
left: 0px; left: 0px;
right: 0px; right: 0px;
text-align: center; text-align: center;
font-size: 15px;
}
.cp div.modal,
.cp div#modal {
/* Navigation buttons */
box-sizing: border-box;
z-index: 9001;
position: fixed;
top: 0px;
left: 0px;
width: 100%;
height: 100vh;
display: none;
background-color: #000;
} }
.cp.slide #modal .button { .cp div.modal .button,
.cp div#modal .button {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
font-size: 30px; font-size: 30px;
opacity: 0.6; opacity: 0.6;
display: none; display: none;
} }
.cp.slide #modal .button:hover { .cp div.modal .button:hover,
.cp div#modal .button:hover {
opacity: 1; opacity: 1;
display: block !important; display: block !important;
} }
.cp.slide #modal #button_exit { .cp div.modal #button_exit,
.cp div#modal #button_exit {
left: 20px; left: 20px;
top: 20px; top: 20px;
z-index: 9001; z-index: 9001;
} }
.cp.slide #modal #button_left { .cp div.modal #button_left,
.cp div#modal #button_left {
left: 6vw; left: 6vw;
bottom: 10vh; bottom: 10vh;
} }
.cp.slide #modal #button_right { .cp div.modal #button_right,
.cp div#modal #button_right {
right: 6vw; right: 6vw;
bottom: 10vh; bottom: 10vh;
} }
.cp.slide #modal #content h1, .cp div.modal.shown,
.cp.slide #modal #content h2, .cp div#modal.shown {
.cp.slide #modal #content h3,
.cp.slide #modal #content h4,
.cp.slide #modal #content h5,
.cp.slide #modal #content h6 {
text-align: center;
}
.cp.slide #modal.shown {
display: block; display: block;
position: fixed; position: fixed;
top: 0px; top: 0px;
@ -153,43 +173,23 @@ body .CodeMirror-focused .cm-matchhighlight {
height: 100vh; height: 100vh;
width: 100%; width: 100%;
} }
.cp.slide #modal #content p,
.cp.slide #modal #content ul,
.cp.slide #modal #content ol {
font-size: 26px;
}
.cp.slide #modal #content img {
position: relative;
min-width: 1%;
max-width: 90%;
max-height: 90%;
margin: auto;
}
.cp div.modal,
.cp div#modal {
box-sizing: border-box;
z-index: 9001;
position: fixed;
top: 0px;
left: 0px;
width: 100%;
height: 100vh;
display: none;
background-color: #000;
}
.cp div.modal #content, .cp div.modal #content,
.cp div#modal #content { .cp div#modal #content {
font-size: 20vh;
}
.cp div.modal #content .slide-frame,
.cp div#modal #content .slide-frame {
box-sizing: border-box; box-sizing: border-box;
border: 1px solid white; border: 1px solid white;
vertical-align: middle; vertical-align: middle;
padding: 2.5vw;
/* center things as much as possible /* center things as much as possible
margin-top: 50vh; margin-top: 50vh;
margin-bottom: 50vh; margin-bottom: 50vh;
transform: translateY(-50%); transform: translateY(-50%);
*/ */
padding: 2.5%;
width: 100vw; width: 100vw;
height: 56.25vw; height: 56.25vw;
max-height: 100vh; max-height: 100vh;
@ -201,80 +201,6 @@ body .CodeMirror-focused .cm-matchhighlight {
left: 0; left: 0;
right: 0; right: 0;
} }
.cp div.modal #content p,
.cp div#modal #content p,
.cp div.modal #content li,
.cp div#modal #content li,
.cp div.modal #content pre,
.cp div#modal #content pre,
.cp div.modal #content code,
.cp div#modal #content code {
font-size: 2.75vw;
line-height: 3.025vw;
}
.cp div.modal #content h1,
.cp div#modal #content h1 {
font-size: 5vw;
line-height: 5.5vw;
}
.cp div.modal #content h2,
.cp div#modal #content h2 {
font-size: 4.2vw;
line-height: 4.62vw;
}
.cp div.modal #content h3,
.cp div#modal #content h3 {
font-size: 3.6vw;
line-height: 3.96vw;
}
.cp div.modal #content h4,
.cp div#modal #content h4 {
font-size: 3vw;
line-height: 3.3vw;
}
.cp div.modal #content h5,
.cp div#modal #content h5 {
font-size: 2.2vw;
line-height: 2.42vw;
}
.cp div.modal #content h6,
.cp div#modal #content h6 {
font-size: 1.6vw;
line-height: 1.76vw;
}
.cp div.modal #content h1,
.cp div#modal #content h1,
.cp div.modal #content h2,
.cp div#modal #content h2,
.cp div.modal #content h3,
.cp div#modal #content h3,
.cp div.modal #content h4,
.cp div#modal #content h4,
.cp div.modal #content h5,
.cp div#modal #content h5,
.cp div.modal #content h6,
.cp div#modal #content h6 {
color: inherit;
text-align: center;
}
.cp div.modal #content pre > code,
.cp div#modal #content pre > code {
display: block;
position: relative;
border: 1px solid #333;
width: 90%;
margin: auto;
padding-left: .25vw;
}
.cp div.modal #content ul,
.cp div#modal #content ul,
.cp div.modal #content ol,
.cp div#modal #content ol {
min-width: 50%;
max-width: 100%;
display: table;
margin: 0 auto;
}
.cp div.modal .center, .cp div.modal .center,
.cp div#modal .center { .cp div#modal .center {
position: relative; position: relative;
@ -288,35 +214,130 @@ body .CodeMirror-focused .cm-matchhighlight {
.cp div#modal.shown { .cp div#modal.shown {
display: block; display: block;
} }
.cp div.modal table, .cp div#modal #content .slide-frame p,
.cp div#modal table { .cp #print .slide-frame p,
margin: 30px; .cp div#modal #content .slide-frame li,
border-collapse: collapse; .cp #print .slide-frame li,
.cp div#modal #content .slide-frame pre,
.cp #print .slide-frame pre,
.cp div#modal #content .slide-frame code,
.cp #print .slide-frame code {
font-size: 27.5%;
line-height: 110%;
}
.cp div#modal #content .slide-frame p p,
.cp #print .slide-frame p p,
.cp div#modal #content .slide-frame li p,
.cp #print .slide-frame li p,
.cp div#modal #content .slide-frame pre p,
.cp #print .slide-frame pre p,
.cp div#modal #content .slide-frame code p,
.cp #print .slide-frame code p,
.cp div#modal #content .slide-frame p li,
.cp #print .slide-frame p li,
.cp div#modal #content .slide-frame li li,
.cp #print .slide-frame li li,
.cp div#modal #content .slide-frame pre li,
.cp #print .slide-frame pre li,
.cp div#modal #content .slide-frame code li,
.cp #print .slide-frame code li,
.cp div#modal #content .slide-frame p pre,
.cp #print .slide-frame p pre,
.cp div#modal #content .slide-frame li pre,
.cp #print .slide-frame li pre,
.cp div#modal #content .slide-frame pre pre,
.cp #print .slide-frame pre pre,
.cp div#modal #content .slide-frame code pre,
.cp #print .slide-frame code pre,
.cp div#modal #content .slide-frame p code,
.cp #print .slide-frame p code,
.cp div#modal #content .slide-frame li code,
.cp #print .slide-frame li code,
.cp div#modal #content .slide-frame pre code,
.cp #print .slide-frame pre code,
.cp div#modal #content .slide-frame code code,
.cp #print .slide-frame code code {
font-size: 100%;
line-height: 1em;
}
.cp div#modal #content .slide-frame ul ul,
.cp #print .slide-frame ul ul,
.cp div#modal #content .slide-frame ol ul,
.cp #print .slide-frame ol ul,
.cp div#modal #content .slide-frame ul ol,
.cp #print .slide-frame ul ol,
.cp div#modal #content .slide-frame ol ol,
.cp #print .slide-frame ol ol {
margin: 0;
}
.cp div#modal #content .slide-frame h1,
.cp #print .slide-frame h1 {
font-size: 50%;
line-height: 110%;
}
.cp div#modal #content .slide-frame h2,
.cp #print .slide-frame h2 {
font-size: 42%;
line-height: 110%;
}
.cp div#modal #content .slide-frame h3,
.cp #print .slide-frame h3 {
font-size: 36%;
line-height: 110%;
}
.cp div#modal #content .slide-frame h4,
.cp #print .slide-frame h4 {
font-size: 30%;
line-height: 110%;
}
.cp div#modal #content .slide-frame h5,
.cp #print .slide-frame h5 {
font-size: 22%;
line-height: 110%;
}
.cp div#modal #content .slide-frame h6,
.cp #print .slide-frame h6 {
font-size: 16%;
line-height: 110%;
}
.cp div#modal #content .slide-frame h1,
.cp #print .slide-frame h1,
.cp div#modal #content .slide-frame h2,
.cp #print .slide-frame h2,
.cp div#modal #content .slide-frame h3,
.cp #print .slide-frame h3,
.cp div#modal #content .slide-frame h4,
.cp #print .slide-frame h4,
.cp div#modal #content .slide-frame h5,
.cp #print .slide-frame h5,
.cp div#modal #content .slide-frame h6,
.cp #print .slide-frame h6 {
color: inherit;
text-align: center;
} }
.cp div.modal table input, .cp div#modal #content .slide-frame pre > code,
.cp div#modal table input { .cp #print .slide-frame pre > code {
height: 100%; display: block;
position: relative;
border: 1px solid #333;
width: 90%; width: 90%;
border: 3px solid #fff; margin: auto;
padding-left: .25vw;
} }
.cp div.modal table tfoot tr td, .cp div#modal #content .slide-frame ul,
.cp div#modal table tfoot tr td { .cp #print .slide-frame ul,
z-index: 4000; .cp div#modal #content .slide-frame ol,
cursor: pointer; .cp #print .slide-frame ol {
min-width: 50%;
max-width: 100%;
display: table;
margin: 0 auto;
} }
.cp div.modal #addtime, .cp div#modal #content .slide-frame img,
.cp div#modal #addtime, .cp #print .slide-frame img {
.cp div.modal #adddate, position: relative;
.cp div#modal #adddate { min-width: 1%;
color: #46E981; max-width: 90%;
border: 1px solid #46E981; max-height: 90%;
padding: 15px; margin: auto;
}
.cp div.modal #adddate,
.cp div#modal #adddate {
border-top-left-radius: 5px;
}
.cp div.modal #addtime,
.cp div#modal #addtime {
border-bottom-left-radius: 5px;
} }

274
www/slide/slide.less
Unescape Escape View File

@ -48,7 +48,7 @@ body {
@media print { @media print {
@page { @page {
margin: 0; margin: 0;
size: auto; size: landscape;
} }
body { body {
.CodeMirror, #cme_toolbox { .CodeMirror, #cme_toolbox {
@ -66,7 +66,7 @@ body {
overflow: visible; overflow: visible;
} }
html { html {
#print { .cp #print {
display: block; display: block;
visibility: visible; visibility: visible;
* { * {
@ -75,17 +75,26 @@ body {
} }
} }
} }
.cp {
/* Slide position (print mode) */
#print { #print {
position: relative; position: relative;
display: none; display: none;
font-size: 11.25vw;
.slide-frame { .slide-frame {
display: flex !important; display: block !important;
justify-content: center; // justify-content: center;
align-items: center; //align-items: center;
flex-flow: column; // flex-flow: column;
padding: 5vh 0; padding: 2.5%;
height: 100vh; margin-top: ~"calc((100vh - 56.25vw)/2)";
width: 100%; border-top: 1px solid black;
border-bottom: 1px solid black;
height: 56.25vw;
width: 100vw;
page-break-after: always; page-break-after: always;
position: relative; position: relative;
box-sizing: border-box; box-sizing: border-box;
@ -99,137 +108,91 @@ body {
position: absolute; position: absolute;
right: 5vh; right: 5vh;
bottom: 5vh; bottom: 5vh;
font-size: 15px;
} }
.slideDate { .slideDate {
position: absolute; position: absolute;
left: 5vh; left: 5vh;
bottom: 5vh; bottom: 5vh;
font-size: 15px;
} }
.slideTitle { .slideTitle {
position: absolute; position: absolute;
top: 5vh; top: 5vh;
left: 0px; right: 0px; left: 0px; right: 0px;
text-align: center; text-align: center;
font-size: 15px;
} }
} }
} }
.cp {
&.slide {
#modal {
.button {
position: absolute;
cursor: pointer;
font-size: 30px;
opacity: 0.6;
display: none;
}
.button:hover {
opacity: 1;
display: block !important;
}
#button_exit {
left: 20px;
top: 20px;
z-index: 9001;
}
#button_left {
left: 6vw;
bottom: 10vh;
}
#button_right {
right: 6vw;
bottom: 10vh;
}
#content {
h1, h2, h3, h4, h5, h6 {
text-align: center;
}
}
&.shown {
display: block;
position: fixed;
top: 0px;
left: 0px;
z-index: 100;
background-color: black;
color: white;
height: 100vh;
width: 100%;
}
}
#modal #content {
p, ul, ol { font-size: 26px; }
img {
position: relative;
min-width: 1%;
max-width: 90%;
max-height: 90%;
margin: auto;
}
}
}
/* Slide position (present mode) */
div.modal, div#modal { div.modal, div#modal {
display: none; display: none;
/* Navigation buttons */
.button {
position: absolute;
cursor: pointer;
font-size: 30px;
opacity: 0.6;
display: none;
}
.button:hover {
opacity: 1;
display: block !important;
}
#button_exit {
left: 20px;
top: 20px;
z-index: 9001;
}
#button_left {
left: 6vw;
bottom: 10vh;
}
#button_right {
right: 6vw;
bottom: 10vh;
}
&.shown {
display: block;
position: fixed;
top: 0px;
left: 0px;
z-index: 100;
background-color: black;
color: white;
height: 100vh;
width: 100%;
}
#content { #content {
box-sizing: border-box; font-size: 20vh;
border: 1px solid white; .slide-frame {
box-sizing: border-box;
vertical-align: middle; border: 1px solid white;
padding: 2.5vw;
/* center things as much as possible
margin-top: 50vh; vertical-align: middle;
margin-bottom: 50vh; // padding: 2.5vw;
transform: translateY(-50%);
*/ /* center things as much as possible
width: 100vw; margin-top: 50vh;
height: 56.25vw; // height:width ratio = 9/16 = .5625 margin-bottom: 50vh;
max-height: 100vh; transform: translateY(-50%);
max-width: 177.78vh; // 16/9 = 1.778
margin: auto;
position: absolute;
top:0;bottom:0; // vertical center
left:0;right:0; // horizontal center
p, li, pre, code {
.size(2.75);
}
h1 { .size(5); } */
h2 { .size(4.2); }
h3 { .size(3.6); }
h4 { .size (3); }
h5 { .size(2.2); }
h6 { .size(1.6); }
h1, h2, h3, h4, h5, h6 {
color: inherit;
text-align: center;
}
pre > code { padding: 2.5%;
display: block; width: 100vw;
position: relative; height: 56.25vw; // height:width ratio = 9/16 = .5625
border: 1px solid #333; max-height: 100vh;
width: 90%; max-width: 177.78vh; // 16/9 = 1.778
margin: auto; margin: auto;
padding-left: .25vw; position: absolute;
} top:0;bottom:0; // vertical center
left:0;right:0; // horizontal center
ul, ol {
min-width: 50%;
max-width: 100%;
display: table;
margin: 0 auto;
} }
} }
@ -260,55 +223,60 @@ div.modal, div#modal {
&.shown { &.shown {
display: block; display: block;
} }
}
table { /* Slide content */
margin: 30px; div#modal #content, #print {
.slide-frame {
border-collapse: collapse; p, li, pre, code {
tr { .size(2.75);
td { p, li, pre, code {
font-size: 100%;
line-height: 1em;
} }
} }
ul, ol {
input { ul, ol {
height: 100%; margin: 0;
width: 90%; }
border: 3px solid @base;
} }
thead { h1 { .size(5); }
tr { h2 { .size(4.2); }
th { h3 { .size(3.6); }
span.remove { h4 { .size (3); }
} h5 { .size(2.2); }
} h6 { .size(1.6); }
}
h1, h2, h3, h4, h5, h6 {
color: inherit;
text-align: center;
} }
tbody {
tr {
td {
} pre > code {
} display: block;
position: relative;
border: 1px solid #333;
width: 90%;
margin: auto;
padding-left: .25vw;
} }
tfoot {
tr { ul, ol {
td { min-width: 50%;
z-index: 4000; max-width: 100%;
cursor: pointer; display: table;
} margin: 0 auto;
}
} }
} // p, ul, ol { padding-left: 10%; }
#addtime, img {
#adddate { position: relative;
color: @cp-green; min-width: 1%;
border: 1px solid @cp-green; max-width: 90%;
padding: 15px; max-height: 90%;
margin: auto;
}
} }
#adddate { .top-left; }
#addtime { .bottom-left; }
} }
} }

Write Preview
Loading…
Cancel
Save