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

Merge branch 'staging' into cursor

Browse Source
This commit is contained in:
yflory 2018-11-12 11:51:17 +01:00
commit c64feae7bf
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/ckeditor-contents.css
View File

@ -24,10 +24,16 @@ body
right: 0; right: 0;
} }
/* Remove margin-top for the first element */
body > *:first-child { body > *:first-child {
margin-top: 0; margin-top: 0;
} }
/* If the magic line is the first element, remove margin-top for the next one */
body > .non-realtime:first-child + * {
margin-top: 0;
}
.cke_editable .cke_editable
{ {
font-size: 16px; font-size: 16px;

2
www/pad/export.js
View File

@ -38,7 +38,7 @@ define([
module.main = function (userDoc, cb) { module.main = function (userDoc, cb) {
var inner; var inner;
if (userDoc instanceof Element || userDoc instanceof HTMLElement) { if (userDoc && userDoc.tagName) {
inner = userDoc; inner = userDoc;
} else { } else {
try { try {