Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

consolidate post-column into topic-body

This commit is contained in:
Jeff Atwood 2014-06-05 02:02:27 -07:00
parent 3ed8b8f155
commit 972d58b876
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/post.js.handlebars
View File

@ -36,7 +36,7 @@
{{/if}} {{/if}}
</div> </div>
<div class='topic-body post-column'> <div class='topic-body'>
<div class='topic-meta-data'> <div class='topic-meta-data'>
{{poster-name post=this expandAction="showPosterExpansion"}} {{poster-name post=this expandAction="showPosterExpansion"}}
<div class='post-info'> <div class='post-info'>

2
app/assets/javascripts/discourse/views/reply_history.js
View File

@ -8,7 +8,7 @@
**/ **/
Discourse.ReplyHistory = Em.CollectionView.extend({ Discourse.ReplyHistory = Em.CollectionView.extend({
tagName: 'section', tagName: 'section',
classNameBindings: [':embedded-posts', ':top', ':post-column', ':offset2', 'hidden'], classNameBindings: [':embedded-posts', ':top', ':topic-body', ':offset2', 'hidden'],
itemViewClass: Discourse.EmbeddedPostView, itemViewClass: Discourse.EmbeddedPostView,
hidden: Em.computed.equal('content.length', 0), hidden: Em.computed.equal('content.length', 0),
previousPost: true previousPost: true

10
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -268,7 +268,7 @@ nav.post-controls {
max-width: 720px; max-width: 720px;
} }
} }
&.top.post-column {padding-left: 0;} &.top.topic-body {padding-left: 0;}
.topic-body, .topic-avatar {border: none;} .topic-body, .topic-avatar {border: none;}
.topic-avatar {padding-left: 15px;} .topic-avatar {padding-left: 15px;}
.post-date {color: scale-color($primary, $lightness: 50%);} .post-date {color: scale-color($primary, $lightness: 50%);}
@ -764,6 +764,7 @@ blockquote { /* solo quotes */
} }
.topic-body { .topic-body {
width: 695px;
float: left; float: left;
position: relative; position: relative;
border-top: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();
@ -794,13 +795,6 @@ blockquote { /* solo quotes */
//columns //columns
.post-column {
width: 695px;
float: left;
padding-left: 10px;
padding-right: 10px;
}
.span11 { .span11 {
width: 84%; width: 84%;
padding-left: 4%; padding-left: 4%;