diff options
| author | friendica <info@friendica.com> | 2013-10-13 15:52:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-10-13 15:52:53 -0700 |
| commit | 3c3c13c63048434b58c99952fa618f7e60a8b2fa (patch) | |
| tree | 3075b6b5554da6c548d5afefec0d2d8abef3e8f0 /view | |
| parent | 1354702d690add3c6ff0c331a190ef3004f7d48c (diff) | |
| parent | fabd60d6b62c6ff087f5b3234a55993a6910e0b3 (diff) | |
| download | volse-hubzilla-3c3c13c63048434b58c99952fa618f7e60a8b2fa.tar.gz volse-hubzilla-3c3c13c63048434b58c99952fa618f7e60a8b2fa.tar.bz2 volse-hubzilla-3c3c13c63048434b58c99952fa618f7e60a8b2fa.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'view')
| -rw-r--r-- | view/theme/redbasic/css/style.css | 10 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 3 | ||||
| -rwxr-xr-x | view/tpl/prv_message.tpl | 6 |
3 files changed, 12 insertions, 7 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0770bd160..fc84cbf57 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 { @@ -3454,4 +3458,4 @@ a .drop-icons { margin-right: 10px; color: #FF0000; } -
\ No newline at end of file + 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"> </div> </div> diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl index 164ba0c6d..d65bc3570 100755 --- a/view/tpl/prv_message.tpl +++ b/view/tpl/prv_message.tpl @@ -24,16 +24,16 @@ <div id="prvmail-submit-wrapper" > <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" /> <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 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 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 id="prvmail-rotator-wrapper" > <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> |