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

Merge pull request #2997 from awesomerobot/master 

fixing the reply-to tab z-index bug
This commit is contained in:
Sam 2014-11-24 13:03:12 +11:00
parent 858630eb27 16cdfcffb5
commit c139498235
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/assets/javascripts/discourse/templates/post.hbs
View File

@ -6,17 +6,7 @@
<article {{bind-attr class=":boxed via_email" id="postElementId" data-post-id="id" data-user-id="user_id"}}> <article {{bind-attr class=":boxed via_email" id="postElementId" data-post-id="id" data-user-id="user_id"}}>
<div class='row'> <div class='row'>
{{#if showUserReplyTab}}
<a href {{action "toggleReplyHistory" this target="view"}} class='reply-to-tab'>
{{#if loadingReplyHistory}}
{{i18n loading}}
{{else}}
<i class="fa fa-mail-forward"></i>
{{avatar reply_to_user imageSize="tiny"}}
<span>{{reply_to_user.username}}</span>
{{/if}}
</a>
{{/if}}
<div class='topic-avatar'> <div class='topic-avatar'>
<div class="contents"> <div class="contents">
{{#unless userDeleted}} {{#unless userDeleted}}
@ -59,6 +49,17 @@
<div class="post-info via-email" title="{{i18n post.via_email}}">{{fa-icon "envelope-o"}}</div> <div class="post-info via-email" title="{{i18n post.via_email}}">{{fa-icon "envelope-o"}}</div>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{#if showUserReplyTab}}
<a href {{action "toggleReplyHistory" this target="view"}} class='reply-to-tab'>
{{#if loadingReplyHistory}}
{{i18n loading}}
{{else}}
<i class="fa fa-mail-forward"></i>
{{avatar reply_to_user imageSize="tiny"}}
<span>{{reply_to_user.username}}</span>
{{/if}}
</a>
{{/if}}
<div {{bind-attr class=":read-state read"}} title="{{i18n post.unread}}">{{fa-icon "circle"}}</div> <div {{bind-attr class=":read-state read"}} title="{{i18n post.unread}}">{{fa-icon "circle"}}</div>
</div> </div>

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

@ -30,13 +30,11 @@ h1 .topic-statuses .topic-status i {
} }
.reply-to-tab { .reply-to-tab {
position: absolute;
right: 420px;
z-index: 400; z-index: 400;
padding: 13px 6px 5px; font-size: 13px;
font-size: 12px; float: right;
margin: 1px 25px 0 0;
color: scale-color($primary, $lightness: 50%); color: scale-color($primary, $lightness: 50%);
} }
.via-email .reply-to-tab { .via-email .reply-to-tab {