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

shuffle around the topic metadata so we don't need absolute positioning

This commit is contained in:
Sam 2013-06-19 14:44:36 +10:00
parent 799b402778
commit e7d6b25998
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,20 +10,6 @@
<div class='row'> <div class='row'>
{{#if controller.multiSelect}} {{#if controller.multiSelect}}
<button class='post-select' {{action selectPost this}}>{{view.selectText}}</button> <button class='post-select' {{action selectPost this}}>{{view.selectText}}</button>
{{else}}
<div class='topic-meta-data-inside'>
<div class='post-info'>
<a href='#' class='post-date' {{bindAttr data-share-url="shareUrl"}}>{{date created_at}}</a>
</div>
{{#if hasHistory}}
<div class='post-info edits'>
<a href='#' class="{{unbound historyHeat}}" {{action showHistory this}} title="{{editDate updated_at}}">
{{editCount}}
<i class='icon-pencil'></i>
</a>
</div>
{{/if}}
</div>
{{/if}} {{/if}}
{{#if showUserReplyTab}} {{#if showUserReplyTab}}
@ -48,6 +34,21 @@
<div class='topic-body span14'> <div class='topic-body span14'>
<div {{bindAttr class="showUserReplyTab:avoid-tab view.repliesHidden:bottom-round :contents :regular view.extraClass"}}> <div {{bindAttr class="showUserReplyTab:avoid-tab view.repliesHidden:bottom-round :contents :regular view.extraClass"}}>
{{view Discourse.PrependPostView postBinding="this"}} {{view Discourse.PrependPostView postBinding="this"}}
{{#unless controller.multiSelect}}
<div class='topic-meta-data-inside'>
<div class='post-info'>
<a href='#' class='post-date' {{bindAttr data-share-url="shareUrl"}}>{{date created_at}}</a>
</div>
{{#if hasHistory}}
<div class='post-info edits'>
<a href='#' class="{{unbound historyHeat}}" {{action showHistory this}} title="{{editDate updated_at}}">
{{editCount}}
<i class='icon-pencil'></i>
</a>
</div>
{{/if}}
</div>
{{/unless}}
{{view Discourse.RawDivView class="cooked" contentBinding="cooked"}} {{view Discourse.RawDivView class="cooked" contentBinding="cooked"}}
{{view Discourse.PostMenuView postBinding="this" postViewBinding="view"}} {{view Discourse.PostMenuView postBinding="this" postViewBinding="view"}}
</div> </div>

6
app/assets/stylesheets/application/topic-post.css.scss
View File

@ -495,14 +495,12 @@
z-index: 490; z-index: 490;
} }
.topic-meta-data-inside { .topic-meta-data-inside {
position: absolute; float: right;
top: 4px; margin-right: 10px;
right: 316px;
z-index: 490; z-index: 490;
.post-info { .post-info {
font-size: 12px; font-size: 12px;
display: inline-block; display: inline-block;
float: right;
margin-right: 12px; margin-right: 12px;
&:first-child { &:first-child {
margin-right: 0; margin-right: 0;