consolidate post-column into topic-body
This commit is contained in:
parent
3ed8b8f155
commit
972d58b876
|
@ -36,7 +36,7 @@
|
|||
{{/if}}
|
||||
</div>
|
||||
|
||||
<div class='topic-body post-column'>
|
||||
<div class='topic-body'>
|
||||
<div class='topic-meta-data'>
|
||||
{{poster-name post=this expandAction="showPosterExpansion"}}
|
||||
<div class='post-info'>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
**/
|
||||
Discourse.ReplyHistory = Em.CollectionView.extend({
|
||||
tagName: 'section',
|
||||
classNameBindings: [':embedded-posts', ':top', ':post-column', ':offset2', 'hidden'],
|
||||
classNameBindings: [':embedded-posts', ':top', ':topic-body', ':offset2', 'hidden'],
|
||||
itemViewClass: Discourse.EmbeddedPostView,
|
||||
hidden: Em.computed.equal('content.length', 0),
|
||||
previousPost: true
|
||||
|
|
|
@ -268,7 +268,7 @@ nav.post-controls {
|
|||
max-width: 720px;
|
||||
}
|
||||
}
|
||||
&.top.post-column {padding-left: 0;}
|
||||
&.top.topic-body {padding-left: 0;}
|
||||
.topic-body, .topic-avatar {border: none;}
|
||||
.topic-avatar {padding-left: 15px;}
|
||||
.post-date {color: scale-color($primary, $lightness: 50%);}
|
||||
|
@ -764,6 +764,7 @@ blockquote { /* solo quotes */
|
|||
}
|
||||
|
||||
.topic-body {
|
||||
width: 695px;
|
||||
float: left;
|
||||
position: relative;
|
||||
border-top: 1px solid scale-color-diff();
|
||||
|
@ -794,13 +795,6 @@ blockquote { /* solo quotes */
|
|||
|
||||
//columns
|
||||
|
||||
.post-column {
|
||||
width: 695px;
|
||||
float: left;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.span11 {
|
||||
width: 84%;
|
||||
padding-left: 4%;
|
||||
|
|
Loading…
Reference in New Issue