harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into zpull

Browse Source
This commit is contained in:
friendica 2013-10-13 15:52:53 -07:00
commit 3c3c13c630
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
view/theme/redbasic/css/style.css
View File

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

3
view/tpl/mail_list.tpl
View File

@ -1,7 +1,8 @@
<div class="generic-content-wrapper" id="mail-list-wrapper"> <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> <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">{{$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" {{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" 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> </div>

6
view/tpl/prv_message.tpl
View File

@ -24,16 +24,16 @@
<div id="prvmail-submit-wrapper" > <div id="prvmail-submit-wrapper" >
<input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" /> <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
<div id="prvmail-upload-wrapper" > <div id="prvmail-upload-wrapper" >
<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div> <i id="prvmail-upload" class="icon-camera jot-icons" title="{{$upload}}"></i>
</div> </div>
<div id="prvmail-attach-wrapper" > <div id="prvmail-attach-wrapper" >
<div id="prvmail-attach" class="icon attach" title="{{$attach}}" ></div> <i id="prvmail-attach" class="icon-paper-clip jot-icons" title="{{$attach}}"></i>
</div> </div>
<div id="prvmail-link-wrapper" > <div id="prvmail-link-wrapper" >
<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div> <i id="prvmail-link" class="icon-link jot-icons" title="{{$insert}}" onclick="jotGetLink(); return false;"></i>
</div> </div>
<div id="prvmail-rotator-wrapper" > <div id="prvmail-rotator-wrapper" >
<img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />