Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge

This commit is contained in:
zotlabs 2016-11-14 13:57:33 -08:00
commit bdc279a49b
2 changed files with 2 additions and 1 deletions

View File

@ -36,7 +36,7 @@
display: inherit;
}
#profile-jot-text:focus {
#profile-jot-text.jot-expanded {
resize: vertical;
}

View File

@ -26,6 +26,7 @@ function initEditor(cb){
'transition' : 'elastic'
});
$(".jothidden").show();
$("#profile-jot-text").addClass('jot-expanded');
if (typeof cb!="undefined") cb();
if(pretext.length)
addeditortext(pretext);