diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index 6e647f8e..28225d7d 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -669,7 +669,11 @@ VIEWS: 'Views', LAST_REPLY: 'Last Reply', TITLE: 'Title', - CONTENT: 'Content' + CONTENT: 'Content', + POST_BY: 'by {{user}} post at {{createdAt}}', + REPLY_BY_1: 'by {{user}}', + REPLY_BY_2: 'reply at {{createdAt}}', + REPLY_BY_3: 'post at {{createdAt}}' } }, diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 10811424..c975a57b 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -669,7 +669,11 @@ VIEWS: '查看数', LAST_REPLY: '最近回复', TITLE: '标题', - CONTENT: '内容' + CONTENT: '内容', + POST_BY: '由 {{user}} 发表于 {{createdAt}}', + REPLY_BY_1: '由 {{user}}', + REPLY_BY_2: '回复于 at {{createdAt}}', + REPLY_BY_3: '发表于 at {{createdAt}}' } }, diff --git a/modules/forums/client/less/forum.less b/modules/forums/client/less/forum.less index 527eb42c..c4e8b6d6 100644 --- a/modules/forums/client/less/forum.less +++ b/modules/forums/client/less/forum.less @@ -25,10 +25,6 @@ } .forum-list { - .pagination { - margin-bottom: 5px; - margin-top: 10px; - } .table-category { border-radius: 6px; } @@ -51,6 +47,9 @@ th { border: solid 2px @brand-primary; padding: 13px 10px; + &:first-child { + width: 60%; + } } } } @@ -77,6 +76,10 @@ } .forum-info { margin-left: 60px; + h4 { + font-size: 16px; + margin-top: 2px; + } } .moderators-title { color: #666; @@ -108,6 +111,81 @@ } } +.post-list { + .pagination { + margin-bottom: 5px; + margin-top: 10px; + } + .table-category { + border-radius: 6px; + } + table { + border-spacing: 0; + border-collapse: inherit; + border: solid 3px @brand-primary; + @media (max-width: @screen-xs-max) { + max-width: 800px; + } + thead { + background-color: @brand-primary; + border: solid 1px @brand-primary; + color: #efefef; + tr { + th { + border: solid 2px @brand-primary; + padding: 13px 10px; + &:first-child { + width: 60%; + } + } + } + } + tbody { + tr { + td { + border-top: none; + white-space: normal !important; + border-bottom: solid 2px lighten(@brand-primary, 45%); + p { + margin-bottom: 5px; + &:last-child { + margin-bottom: 0; + } + } + .post-icon { + float: left; + font-size: 18px; + margin: 8px 8px; + color: #ccc; + &.has-new-reply { + color: @brand-primary; + } + } + .post-info { + margin-left: 40px; + h4 { + font-size: 16px; + margin-top: 2px; + margin-bottom: 5px; + } + .topic-by { + color: #999; + } + } + } + &:hover { + background-color: #f1f6fb; + } + } + tr:last-child { + td { + border-bottom: none; + } + } + } + } +} + .add-moderator-popover { max-width: 250px; max-height: 150px; @@ -140,5 +218,5 @@ } .post-view { - margin-bottom: 100px; + margin-bottom: 30px; } \ No newline at end of file diff --git a/modules/forums/client/views/post.client.view.html b/modules/forums/client/views/post.client.view.html index 3d4f602a..7333810b 100644 --- a/modules/forums/client/views/post.client.view.html +++ b/modules/forums/client/views/post.client.view.html @@ -65,7 +65,7 @@ -
  • +
  • -
    +