Skip to content

Commit efe465b

Browse files
JacksonTianJacksonTian
committed
文章页面的样式
1 parent 68b8964 commit efe465b

File tree

5 files changed

+40
-43
lines changed

5 files changed

+40
-43
lines changed

‎public/stylesheets/style.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ img.unread {
420420
clear: left;
421421
}
422422
#collect_btn {
423-
margin-top: -10px;
423+
424424
}
425425
#backtotop {
426426
width: 24px;

‎views/reply/reply.html‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,10 @@
3030
</span>
3131
</div>
3232
</div>
33-
<!-- <div class='sep5'></div> -->
3433
<div class='reply_content'>
3534
<%- markdown(reply.content) %>
3635
</div>
3736
<div class='clearfix'>
38-
<!-- <div class='sep5'></div> -->
3937
<div class='reply2_area'>
4038
<% if (reply.replies.length >0) { %>
4139
<%- partial('reply/reply2',{collection: reply.replies, as: 'reply2'}) %>
@@ -47,7 +45,6 @@
4745
<textarea class='span8 editor reply_editor' id="reply2_editor_<%- reply._id %>" name='r2_content' rows='4'></textarea>
4846
<p style="margin-top: 10px">
4947
<button class='btn reply2_submit_btn' type="submit" data-id='<%= reply._id %>'>回复</button>
50-
<span class='sp10'></span>
5148
<span class='col_fade'>Ctrl+Enter 快捷回复</span>
5249
</p>
5350
</form>

‎views/topic/index.html‎

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -59,48 +59,51 @@ <h3>
5959
<%- markdown(topic.content) %>
6060
</div>
6161
<hr>
62-
<% if (topic.tags.length > 0) { %>
63-
<span class='col_fade'>标签：</span>
64-
<%- partial('tag/tag_in_topic',{ collection: topic.tags, as: 'tag' }) %>
65-
<% } else { %>
66-
<span class='col_fade'>标签：无</span>
67-
<% } %>
68-
<div class='sep5'></div>
69-
<span class='col_fade'>
70-
<a class='dark' href="/user/<%= topic.author.name %>"><%= topic.author.name %></a> 在 <%= topic.friendly_create_at %> 发布
71-
</span>
72-
<% if (topic.friendly_create_at != topic.friendly_update_at) { %>
73-
<div class='sep5'></div>
74-
<span class='col_fade'>
75-
<a class='dark' href="/user/<%= topic.author.name %>"><%= topic.author.name %></a> 在 <%= topic.friendly_update_at %> 重新编辑
76-
</span>
77-
<% } %>
78-
<span class='sp10'></span>
79-
<a class='dark' id='share_weibo_btn'
80-
href="javascript:void((function(s,d,e,r,l,p,t,z,c){var%20f='http://v.t.sina.com.cn/share/share.php?appkey=<%= config.weibo_key %>',u=z||d.location,p=['&url=',e(u),'&title=',e(t||d.title),'&source=',e(r),'&sourceUrl=',e(l),'&content=',c||'gb2312','&pic=',e(p||'')].join('');function%20a(){if(!window.open([f,p].join(''),'mb',['toolbar=0,status=0,resizable=1,width=440,height=430,left=',(s.width-440)/2,',top=',(s.height-430)/2].join('')))u.href=[f,p].join('');};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();})(screen,document,encodeURIComponent,'','','','分享来自<%= config.name %>的话题：<%= topic.title %>','',''));"
81-
>分享到 weibo</a>
82-
<% if (locals.current_user) { %>
83-
<% if (!topic.in_collection) { %>
84-
<button class='btn btn-success' id='collect_btn' action='collect'>加入收藏</button>
62+
<div class="tags">
63+
<% if (topic.tags.length > 0) { %>
64+
<span class='col_fade'>标签：</span>
65+
<%- partial('tag/tag_in_topic',{ collection: topic.tags, as: 'tag' }) %>
8566
<% } else { %>
86-
<button class='btn' id='collect_btn' action='de_collect'>取消收藏</button>
67+
<span class='col_fade'>标签：无</span>
8768
<% } %>
88-
<% } %>
89-
<% if (locals.current_user) { %>
90-
<% if (current_user.is_admin) { %>
91-
<% if (topic.top) { %>
92-
<a href='/topic/<%= topic._id %>/top/0'><img class='user_icon' src='<%- config.site_static_host %>/images/star_fav_empty_icon&16.png' title='取消置顶' /></a>
93-
<% } else { %>
94-
<a href='/topic/<%= topic._id %>/top/1'><img class='user_icon' src='<%- config.site_static_host %>/images/star_fav_icon&16.png' title='置顶' /></a>
69+
</div>
70+
<div class="changes">
71+
<span class='col_fade'>
72+
<a class='dark' href="/user/<%= topic.author.name %>"><%= topic.author.name %></a> 在 <%= topic.friendly_create_at %> 发布
73+
</span>
74+
<% if (topic.friendly_create_at != topic.friendly_update_at) { %>
75+
<span class='col_fade'>
76+
<a class='dark' href="/user/<%= topic.author.name %>"><%= topic.author.name %></a> 在 <%= topic.friendly_update_at %> 重新编辑
77+
</span>
9578
<% } %>
96-
<a href='/topic/<%= topic._id %>/edit'><img class='user_icon' src='<%- config.site_static_host %>/images/doc_edit_icon&16.png' title='编辑' /></a>
97-
<a href='javascript:;' data-id="<%= topic._id %>" class='delete_topic_btn'><img class='user_icon' src='<%- config.site_static_host %>/images/trash_icon&16.png' title='删除' /></a>
98-
<% } else { %>
99-
<% if (current_user._id == topic.author_id) { %>
79+
</div>
80+
<div class="action">
81+
<a class='dark' id='share_weibo_btn'
82+
href="javascript:void((function(s,d,e,r,l,p,t,z,c){var%20f='http://v.t.sina.com.cn/share/share.php?appkey=<%= config.weibo_key %>',u=z||d.location,p=['&url=',e(u),'&title=',e(t||d.title),'&source=',e(r),'&sourceUrl=',e(l),'&content=',c||'gb2312','&pic=',e(p||'')].join('');function%20a(){if(!window.open([f,p].join(''),'mb',['toolbar=0,status=0,resizable=1,width=440,height=430,left=',(s.width-440)/2,',top=',(s.height-430)/2].join('')))u.href=[f,p].join('');};if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else%20a();})(screen,document,encodeURIComponent,'','','','分享来自<%= config.name %>的话题：<%= topic.title %>','',''));"
83+
>分享到 weibo</a>
84+
<% if (locals.current_user) { %>
85+
<% if (!topic.in_collection) { %>
86+
<button class='btn btn-success' id='collect_btn' action='collect'>加入收藏</button>
87+
<% } else { %>
88+
<button class='btn' id='collect_btn' action='de_collect'>取消收藏</button>
89+
<% } %>
90+
<% } %>
91+
<% if (locals.current_user) { %>
92+
<% if (current_user.is_admin) { %>
93+
<% if (topic.top) { %>
94+
<a href='/topic/<%= topic._id %>/top/0'><img class='user_icon' src='<%- config.site_static_host %>/images/star_fav_empty_icon&16.png' title='取消置顶' /></a>
95+
<% } else { %>
96+
<a href='/topic/<%= topic._id %>/top/1'><img class='user_icon' src='<%- config.site_static_host %>/images/star_fav_icon&16.png' title='置顶' /></a>
97+
<% } %>
10098
<a href='/topic/<%= topic._id %>/edit'><img class='user_icon' src='<%- config.site_static_host %>/images/doc_edit_icon&16.png' title='编辑' /></a>
99+
<a href='javascript:;' data-id="<%= topic._id %>" class='delete_topic_btn'><img class='user_icon' src='<%- config.site_static_host %>/images/trash_icon&16.png' title='删除' /></a>
100+
<% } else { %>
101+
<% if (current_user._id == topic.author_id) { %>
102+
<a href='/topic/<%= topic._id %>/edit'><img class='user_icon' src='<%- config.site_static_host %>/images/doc_edit_icon&16.png' title='编辑' /></a>
103+
<% } %>
101104
<% } %>
102105
<% } %>
103-
<% } %>
106+
</div>
104107
</div>
105108
</div>
106109
<% if (topic.replies && topic.replies.length > 0) { %>

‎views/topic/small.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
<li>
22
<div><a class='dark' href="/topic/<%= topic._id %>" title="<%= topic.title %>"><%= topic.title %></a></div>
3-
<div class='sep5'></div>
43
</li>

‎views/user/star.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,5 @@
44
<a class='dark star_name' href="/user/<%= user.name %>"><%= user.name %></a>
55
</div>
66
<span class='col_fade'><%= user.follower_count %> 粉丝</span>
7-
<span class='sp5'></span>
87
<span class='col_fade'><%= user.following_count %> 关注</span>
9-
<div class='sep5'></div>
108
</li>

0 commit comments

Comments
 (0)