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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory
2017-06-26 15:16:45 +02:00
parent 36ef4178dc 51e06e68a7
commit 3076ade23a
5 changed files with 38 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/common-history.js
View File

@@ -225,7 +225,7 @@ define([
if (e.which === 33) { p(); return render(getNext(10)); } // PageUp if (e.which === 33) { p(); return render(getNext(10)); } // PageUp
if (e.which === 34) { p(); return render(getPrevious(10)); } // PageUp if (e.which === 34) { p(); return render(getPrevious(10)); } // PageUp
if (e.which === 27) { p(); $close.click(); } if (e.which === 27) { p(); $close.click(); }
}).focus(); }).keyup(function (e) { e.stopPropagation(); }).focus();
$cur.on('change', function () { $cur.on('change', function () {
render( get($cur.val() - 1) ); render( get($cur.val() - 1) );
}); });

4
www/slide/index.html
View File

@@ -35,8 +35,6 @@
overflow:hidden; overflow:hidden;
box-sizing: border-box; box-sizing: border-box;
} }
/* We use !important here to override the 96% set to the element in DecorateToolbar.js
when we enter fullscreen mode. It allows us to avoid changing the iframe's size in JS */
body #pad-iframe.fullscreen { body #pad-iframe.fullscreen {
top: 0px; top: 0px;
height: 100%; height: 100%;
@@ -45,8 +43,6 @@
top: 0px; top: 0px;
height: 100%; height: 100%;
} }
</style> </style>
</head> </head>
<body> <body>

3
www/slide/inner.html
View File

@@ -5,7 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"/> <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<link rel="stylesheet" href="/customize/main.css"> <link rel="stylesheet" href="/customize/main.css">
<link rel="stylesheet" href="./slide.css">
<link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css"> <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
<script src="/bower_components/jquery/dist/jquery.min.js"></script> <script src="/bower_components/jquery/dist/jquery.min.js"></script>
<script src="/bower_components/codemirror/lib/codemirror.js"></script> <script src="/bower_components/codemirror/lib/codemirror.js"></script>
@@ -35,6 +34,8 @@
<script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script> <script src="/bower_components/codemirror/addon/fold/markdown-fold.js"></script>
<script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script> <script src="/bower_components/codemirror/addon/fold/comment-fold.js"></script>
<script src="/bower_components/codemirror/addon/display/placeholder.js"></script> <script src="/bower_components/codemirror/addon/display/placeholder.js"></script>
<script data-bootload="inner.js" data-main="/common/boot.js" src="/bower_components/requirejs/require.js"></script>
</head> </head>
<body> <body>
<div id="bar"></div> <div id="bar"></div>

1
www/slide/inner.js Normal file
View File

@@ -0,0 +1 @@
define([ 'less!/slide/slide.less' ], function () {});

51
www/slide/slide.less
View File

@@ -1,5 +1,5 @@
@import "../../customize.dist/src/less/variables.less"; @import "/customize/src/less/variables.less";
@import "../../customize.dist/src/less/mixins.less"; @import "/customize/src/less/mixins.less";
// used for slides // used for slides
.viewportRatio (@x, @y, @p: 100) { .viewportRatio (@x, @y, @p: 100) {
@@ -158,12 +158,8 @@ body {
height: ~"calc(100vh - 2px)"; height: ~"calc(100vh - 2px)";
} }
} }
/*.slide-frame:first-child {
margin-top: ~"calc(((100vh - 56.25vw)/2))";
}*/
} }
/* Slide position (present mode) */ /* Slide position (present mode) */
div.modal, div#modal { div.modal, div#modal {
display: none; display: none;
@@ -212,21 +208,15 @@ div.modal, div#modal {
white-space: nowrap; white-space: nowrap;
.slide-frame { .slide-frame {
overflow: hidden; overflow: hidden;
display: inline-block; display: flex;
flex-flow: column !important;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid; border: 1px solid;
white-space: normal; white-space: normal;
vertical-align: middle; vertical-align: middle;
/* center things as much as possible
margin-top: 50vh;
margin-bottom: 50vh;
transform: translateY(-50%);
*/
padding: 0.5em; padding: 0.5em;
width: 100vw; width: 100vw;
height: 56.25vw; // height:width ratio = 9/16 = .5625 height: 56.25vw; // height:width ratio = 9/16 = .5625
@@ -324,7 +314,6 @@ div#modal #content, #print {
margin: 0 auto; margin: 0 auto;
padding-left: 0.3em; padding-left: 0.3em;
} }
// p, ul, ol { padding-left: 10%; }
img { img {
position: relative; position: relative;
@@ -364,7 +353,7 @@ div#modal #content, #print {
top: 15vh; bottom: 15vh; top: 15vh; bottom: 15vh;
left: 10vw; right: 10vw; left: 10vw; right: 10vw;
border: 1px solid black; border: 1px solid black;
z-index: 10; z-index: 100000;
overflow: auto; overflow: auto;
display: none; display: none;
font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif; font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
@@ -396,3 +385,31 @@ div#modal #content, #print {
} }
} }
.slide-frame * {
max-width: 100%;
max-height: 100%;
}
p {
display: flex;
flex-flow: column;
padding: 0;
margin: 0;
min-height:0;
flex: 1;
}
media-tag {
min-height: 0;
flex: 1;
display: block;
text-align: center;
}
media-tag img {
max-height: 100% !important;
}
media-tag iframe {
min-height: 100%;
}