Merge pull request #179 from git-marijus/master

reorder items in private-mail - the delete button is on the right side e...
This commit is contained in:
friendica 2013-10-13 14:48:14 -07:00
commit fabd60d6b6
2 changed files with 8 additions and 3 deletions

View File

@ -3318,8 +3318,8 @@ ul.menu-popup {
#mail-list-wrapper {
border-bottom: 1px solid #ccc;
margin: 5px 5px 5px 5px;
border-top: 1px solid #ccc;
padding: 5px 5px 5px 5px;
}
span.mail-list {
@ -3339,6 +3339,10 @@ width: 30px;
img.mail-list-sender-photo {
height: 24px;
width: 24px;
float: left;
margin-right: 30px;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
}
.tag1 {

View File

@ -1,7 +1,8 @@
<div class="generic-content-wrapper" id="mail-list-wrapper">
<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
<span class="mail-list">{{$from_name}}</span>
<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-list" title="{{$date}}">{{$date}}</span>
<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
<div class="clear">&nbsp;</div>
</div>