aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-10-13 14:48:14 -0700
committerfriendica <info@friendica.com>2013-10-13 14:48:14 -0700
commitfabd60d6b62c6ff087f5b3234a55993a6910e0b3 (patch)
tree94d90ba4a1d0b113238ff3e404622c5e82f7bf59 /view
parentd5aa7aacbe76af0e391397929260aa68f91153dc (diff)
parent2d23fcfe5a150987a7ac079df0b2113b082f1fca (diff)
downloadvolse-hubzilla-fabd60d6b62c6ff087f5b3234a55993a6910e0b3.tar.gz
volse-hubzilla-fabd60d6b62c6ff087f5b3234a55993a6910e0b3.tar.bz2
volse-hubzilla-fabd60d6b62c6ff087f5b3234a55993a6910e0b3.zip
Merge pull request #179 from git-marijus/master
reorder items in private-mail - the delete button is on the right side e...
Diffstat (limited to 'view')
-rw-r--r--view/theme/redbasic/css/style.css8
-rwxr-xr-xview/tpl/mail_list.tpl3
2 files changed, 8 insertions, 3 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index e91e4dc5a..8116495a7 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -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 {
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index e6ddf3651..24966ad1d 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -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>