Merge branch 'release'

pull/18/head
Frode Petterson 2016-04-06 11:47:06 +02:00
commit e0d3c2e1e0
1 changed files with 6 additions and 0 deletions

View File

@ -2818,6 +2818,12 @@ class H5PContentValidator {
if (isset($semantics->font->background) && $semantics->font->background) {
$stylePatterns[] = '/^background-color: *(#[a-f0-9]{3}[a-f0-9]{3}?|rgba?\([0-9, ]+\)) *;?$/i';
}
if (isset($semantics->font->spacing) && $semantics->font->spacing) {
$stylePatterns[] = '/^letter-spacing: *[0-9.]+(em|px|%) *;?$/i';
}
if (isset($semantics->font->height) && $semantics->font->height) {
$stylePatterns[] = '/^line-height: *[0-9.]+(em|px|%|) *;?$/i';
}
}
// Aligment is allowed for all wysiwyg texts