jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突

This commit is contained in:
cxt 2016-04-08 16:02:10 +08:00
parent fcddaf403c c88e924843
commit de8d630fc1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/assets/wechat/blog_detail.html
View File

@ -8,7 +8,7 @@
<div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div> <div class="post-title hidden"><a herf="javascript:void(0);" class="mr10">{{blog.user.realname}}</a>发表博客</div>
<div class="cl"></div> <div class="cl"></div>
<div class="post-content" style="height:auto;"> <div class="post-content" style="height:auto;">
<div class="post-all-content c-grey2 mt10">{{blog.content}}<br /></div> <div class="post-all-content c-grey2 mt10" ng-bind-html="blog.content|safeHtml"></div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<span class="c-grey f13 mt10 fl">{{blog.created_at}}</span> <span class="c-grey f13 mt10 fl">{{blog.created_at}}</span>

2
public/assets/wechat/jour_message_detail.html
View File

@ -7,7 +7,7 @@
<div class="post-title hidden">{{message.created_on}}</div> <div class="post-title hidden">{{message.created_on}}</div>
<div class="cl"></div> <div class="cl"></div>
<div class="post-content c-grey2 mt10" style="height:auto;"> <div class="post-content c-grey2 mt10" style="height:auto;">
<div class="post-all-content">{{message.notes}}</div> <div class="post-all-content" ng-bind-html="message.notes|safeHtml"></div>
</div> </div>
<div class="cl"></div> <div class="cl"></div>
</div> </div>