Revert "Merge branch 'develop' into 'origin'"

This reverts commit e1922bd555.
This commit is contained in:
harukin
2019-12-29 13:31:01 +09:00
parent bce8c2ee5a
commit 8c207cf1eb
41 changed files with 5 additions and 3616 deletions

View File

@@ -18,7 +18,7 @@
{{$anon_extras}}
</div>
{{/if}}
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text" placeholder="{{$comment}}" name="body" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onkeydown="if((event.ctrlKey&&event.keyCode==13) || (event.metaKey&&event.keyCode==13)){document.getElementById('comment-edit-submit-{{$id}}').click();return false};"></textarea>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text" placeholder="{{$comment}}" name="body" ondragenter="linkdropper(event);" ondragleave="linkdropexit(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" ></textarea>
<div id="comment-tools-{{$id}}" class="pt-2 comment-tools">
<div id="comment-edit-bb-{{$id}}" class="btn-toolbar pull-left">
<div class="btn-group mr-2">

View File

@@ -52,7 +52,7 @@
</button>
{{/if}}
</div>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" onkeydown="if((event.ctrlKey&&event.keyCode==13) || (event.metaKey&&event.keyCode==13)){document.getElementById('dbtn-submit').click();return false};" >{{$content}}</textarea>
<textarea class="profile-jot-text" id="profile-jot-text" name="body" tabindex="2" placeholder="{{$placeholdtext}}" >{{$content}}</textarea>
</div>
{{if $attachment}}
<div id="jot-attachment-wrap">