Merge branch 'staging' into cursor

pull/1/head
yflory 2018-11-12 11:51:17 +01:00
commit c64feae7bf
2 changed files with 7 additions and 1 deletions

View File

@ -24,10 +24,16 @@ body
right: 0;
}
/* Remove margin-top for the first element */
body > *:first-child {
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
{
font-size: 16px;

View File

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