minor fixes
This commit is contained in:
parent
211bd5ab68
commit
1379191757
|
@ -205,7 +205,7 @@ var dash_editor_html_load = function() {
|
|||
if (selection && selection.length>0) text = selection;
|
||||
var id = (new Date()).getTime();
|
||||
var html = '<div class="zira-collapse-toggle" data-toggle="collapse" data-target=".collapse-block-'+id+'">'+t('Hidden text')+'</div>';
|
||||
html += '<div class="collapse zira-collapse-block collapse-block-'+id+'">'+text+'</div>';
|
||||
html += '<div class="collapse zira-collapse-block collapse-block-'+id+'">'+text+'</div> ';
|
||||
this.editor.execCommand('mceInsertContent', false, html);
|
||||
})});
|
||||
})
|
||||
|
|
|
@ -149,10 +149,21 @@
|
|||
var _p = new RegExp('style=(?:["])?([^">]+)(?:["])?', 'i');
|
||||
var _m = _p.exec(m[0]);
|
||||
if (_m && typeof(_m[0]) != "undefined" && typeof(_m[1]) != "undefined") {
|
||||
s = ' ' + _m[0];
|
||||
m[1] = m[1].replace(_m[0], ' ');
|
||||
m[3] = m[3].replace(_m[0], ' ');
|
||||
s += _m[1];
|
||||
if (s.indexOf('width')<0) {
|
||||
m[1] = m[1].replace(_m[0], ' ');
|
||||
m[3] = m[3].replace(_m[0], ' ');
|
||||
}
|
||||
}
|
||||
if (s.indexOf('width')<0) {
|
||||
var __p = new RegExp('width=(?:["])?([^">]+)(?:["])?', 'i');
|
||||
var __m = __p.exec(m[0]);
|
||||
if (__m && typeof(__m[0]) != "undefined" && typeof(__m[1]) != "undefined") {
|
||||
s += 'width:'+__m[1];
|
||||
if (__m[1].indexOf('%')<0) s += 'px;';
|
||||
}
|
||||
}
|
||||
if (s.length > 0) s = ' style="' + s + '"';
|
||||
content = content.replace(m[0], '<div class="image-wrapper"'+s+'>'+
|
||||
'<img class="image parsed-image" '+m[1]+'alt="'+m[2]+'"'+m[3]+'>'+
|
||||
'<div class="image-description">'+m[2]+
|
||||
|
|
|
@ -237,6 +237,7 @@
|
|||
$('.sidebar').length==1 &&
|
||||
$('#content').length==1 &&
|
||||
$('#top-menu-wrapper').length>0 &&
|
||||
$('.sidebar').height()>$(window).height() &&
|
||||
navigator.userAgent.toLowerCase().indexOf('msie')<0 &&
|
||||
typeof(window.orientation) == "undefined" &&
|
||||
typeof(designer_style_theme)=="undefined"
|
||||
|
|
|
@ -25,7 +25,7 @@ function error_handler($severity, $message, $file, $line) {
|
|||
if (LOG_ERRORS) {
|
||||
Zira\Log::write(Zira\Log::getErrorType($severity).': '.$message.' in '.$file.':'.$line);
|
||||
}
|
||||
if (defined('DEBUG') && DEBUG) {
|
||||
if ((defined('DEBUG') && DEBUG) || ($severity != E_DEPRECATED && $severity != E_STRICT && $severity != E_WARNING)) {
|
||||
throw new ErrorException(Zira\Log::getErrorType($severity).': '.$message, 0, $severity, $file, $line);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -533,6 +533,7 @@ article .article-info {
|
|||
}
|
||||
article .article {
|
||||
margin: 30px 0px;
|
||||
overflow: hidden;
|
||||
}
|
||||
article .article p {
|
||||
line-height: 26px;
|
||||
|
|
|
@ -822,6 +822,7 @@ article .article-info {
|
|||
}
|
||||
article .article {
|
||||
margin: 30px 0px;
|
||||
overflow: hidden;
|
||||
}
|
||||
article .rating {
|
||||
color: #888888;
|
||||
|
|
|
@ -571,6 +571,7 @@ article .article-info {
|
|||
}
|
||||
article .article {
|
||||
margin: 30px 0px;
|
||||
overflow: hidden;
|
||||
}
|
||||
article .rating {
|
||||
color: #888888;
|
||||
|
|
Loading…
Reference in a new issue