diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css index 035f484..69551c4 100644 --- a/public/stylesheets/style.css +++ b/public/stylesheets/style.css @@ -10,15 +10,10 @@ body { text-overflow: ellipsis; vertical-align: middle; } -#wrapper { - padding-top: 34px; - background: #e5e5e5; -} #main { - width: 1060px; - margin: 0px auto; - padding: 0px 0px 30px 0px; + width: 1120px; + margin: 40px auto; min-height:400px; position: relative; } @@ -27,35 +22,60 @@ body { } #content { padding: 0; - width: 758px; + width: 818px; float: left; } #sidebar { width: 290px; - float: right; font-size: 14px; + float: right; + margin-bottom: 20px; } #content .panel { background: hsla(0, 0%, 100%, 1); } +#content .topic_full_title { + font-size: 20px; + font-weight: bold; +} +#content .changes { + font-size: 12px; + margin-top: 10px; + margin-left: 10px; + color: rgb(131, 131, 131); +} +#content .action { + text-align: right; +} +#content h3 { +} +#manage_topic { + padding: 10px; +} #sidebar .panel { background: hsla(0, 0%, 100%, 1); + font-size: 13px; } #sidebar .header { color: hsl(202, 6%, 34%); } +#sidebar .topic_title { + max-width: 270px; +} #footer { - height: 200px; + height: 160px; clear: both; position: relative; - box-shadow: 0px -1px 0px hsl(0,0%,90%); - margin-top: 8px; + background: white; + box-shadow: 0 -1px 0px rgba(168, 168, 168, 0.33); } #footer_main { width: 1040px; margin: 0px auto; color: #e2e2e2; padding: 20px 0px; + font-size: 13px; + line-height: 2em; } #mark_all_messages_btn { margin: 5px 0px; @@ -76,7 +96,6 @@ a.dark { text-overflow: ellipsis; text-decoration: none; color: #666; - font-size: 14px; } a.dark:link, a.dark:visited, a.dark:active { color: #666; @@ -123,10 +142,14 @@ a.light:hover { } .panel .inner { padding: 10px; + line-height: 2em; } .panel .inner.no-padding { padding: 0; } +.panel .inner li { + line-height: 2em; +} .panel>.cell:last-child { box-shadow: none; } @@ -134,7 +157,24 @@ a.light:hover { overflow: hidden; position: relative; box-shadow: 0px 1px 0px hsl(0, 0%, 90%); - padding: 3px 10px; + padding: 10px; + color: rgb(168, 168, 168); + font-size: 13px; +} +.cell .reply_count { + width: 70px; + display: inline-block; + text-align: center; +} +.cell .count_of_replies { + color: rgb(158, 120, 192); +} +.cell .count_seperator { + margin: 0 -3px; + font-size: 10px; +} +.cell .count_of_visits { + font-size: 11px; } .cell .cell { box-shadow: 0px -1px 0px hsl(0, 0%, 90%); @@ -143,17 +183,6 @@ a.light:hover { .cell:last-child { border-bottom: none; } -.cell .block { - float: left; - text-align: center; - font-size: 14px; - color: hsl(0,0%,70%); - line-height: 48px; -} -.cell .block.count { - width: 70px; - margin: 0px 8px; -} .cell.message, .cell[message_id] { padding: 10px; } @@ -170,16 +199,11 @@ a.light:hover { padding: 10px; } .last_time { - position: absolute; - color: hsl(0, 7%, 70%); - top: 0px; - right: 0px; font-size: 13px; - line-height: 53px; - padding: 0px 8px; + display: inline-block; + margin-left: 20px; } .board .floor { - line-height: 24px; } .board a { color: #404040; @@ -306,7 +330,6 @@ a.user_avatar:hover { width: 48px; } .user_card .user_name { - font-size: 16px; } .cell .user_avatar { } @@ -386,21 +409,16 @@ a.user_avatar:hover { height: 48px; line-height: 48px; } -.topic_wrap { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - line-height: 48px; - width: 500px; - font-size: 18px; -} a.topic_title { - font-size: 16px; - line-height: 40px; + max-width: 500px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: inline-block; + vertical-align: middle; } .star_name { - font-size: 14px; } img.unread { opacity: 0.1; @@ -428,12 +446,14 @@ img.unread { #backtotop { width: 24px; color: gray; - padding: 10px 4px; + padding: 12px 0px 12px 5px; display:none; position: fixed; cursor: pointer; text-align: center; z-index: 20; + background-color: white; + border-radius: 12px 0px 0px 12px; } .tabbable ul { max-height: 40px; @@ -544,6 +564,7 @@ textarea[id^=wmd-input] { position: relative; box-shadow: 0px 0px 1px hsl(0, 0%, 40%); background: white; + font-size: 13px; } .navbar-inner { background: none; @@ -553,7 +574,7 @@ textarea[id^=wmd-input] { } .navbar .container { width: 1060px; - margin: 4px auto; + margin: 0px auto; } .navbar .brand { padding: 4px 0px 0px 20px; @@ -703,9 +724,6 @@ textarea.editor { margin-top: 10px; } -#content .header { -} - .marked_icon { float: right; } diff --git a/views/topic/abstract.html b/views/topic/abstract.html index 13c0cc3..d3f3c49 100644 --- a/views/topic/abstract.html +++ b/views/topic/abstract.html @@ -1,31 +1,35 @@
-
- - - -
+ + + -
- <%= topic.reply_count %>/<%= topic.visit_count %> -
+ + + <%= topic.reply_count %> + + / + + <%= topic.visit_count %> + + -
- + + <% if (topic.top) { %> 置顶 <% } %> - - <%= topic.title %> + <%= topic.title %> + + + <% if (topic.reply) {%> + + <%= topic.reply.friendly_create_at %> -
- <% if(topic.reply) {%> -
<%= topic.reply.friendly_create_at %>
<% } %> - <% if(!topic.reply) {%> -
<%= topic.friendly_create_at %>
+ <% if (!topic.reply) {%> + <%= topic.friendly_create_at %> <% } %>
diff --git a/views/topic/index.html b/views/topic/index.html index 1f34f90..2020313 100644 --- a/views/topic/index.html +++ b/views/topic/index.html @@ -42,45 +42,77 @@
- + + <% if (topic.top) { %> + 置顶 + <% } %> + <%= topic.title %> + +
+
+ <%= topic.author.name %> + 在 <%= topic.friendly_create_at %> 发布 +
+ <% if (topic.friendly_create_at != topic.friendly_update_at) { %> +
+ <%= topic.author.name %> + 在 <%= topic.friendly_update_at %> 重新编辑 +
+ <% } %> +
+ <% if (locals.current_user) { %> +
+ <% if (current_user.is_admin) { %> + <% if (topic.top) { %> + + + + <% } else { %> + + + + <% } %> + + + + <% } else { %> + <% if (current_user._id == topic.author_id) { %> + + + <% } %> + <% } %> +
+ <% } %>
-

- <% if (topic.top) { %> - 置顶 - <% } %> - <%= topic.title %> -

-
+
<%- markdown(topic.content) %>
-
-
- <% if (topic.tags.length > 0) { %> - 标签: - <%- partial('tag/tag_in_topic',{ collection: topic.tags, as: 'tag' }) %> - <% } else { %> - 标签:无 - <% } %> -
-
- - <%= topic.author.name %> 在 <%= topic.friendly_create_at %> 发布 - - <% if (topic.friendly_create_at != topic.friendly_update_at) { %> - - <%= topic.author.name %> 在 <%= topic.friendly_update_at %> 重新编辑 - - <% } %> -
+ <% if (topic.tags.length > 0) { %> +
+ 标签: + <%- partial('tag/tag_in_topic',{ collection: topic.tags, as: 'tag' }) %> +
+ <% } %> +
- 分享到 weibo + >分享到微博 <% if (locals.current_user) { %> <% if (!topic.in_collection) { %> @@ -88,21 +120,6 @@ <% } %> <% } %> - <% if (locals.current_user) { %> - <% if (current_user.is_admin) { %> - <% if (topic.top) { %> - - <% } else { %> - - <% } %> - - - <% } else { %> - <% if (current_user._id == topic.author_id) { %> - - <% } %> - <% } %> - <% } %>
diff --git a/views/topic/small.html b/views/topic/small.html index 36bed96..12d26eb 100644 --- a/views/topic/small.html +++ b/views/topic/small.html @@ -1,3 +1,3 @@
  • -
    <%= topic.title %>
    +
    <%= topic.title %>