diff options
author | zotlabs <mike@macgirvin.com> | 2019-07-28 20:00:14 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2019-07-28 20:00:14 -0700 |
commit | 70e4a2c4fa69135dea97d1b6323fe6f8e17961c7 (patch) | |
tree | 38e8f097ec0d9aecb12dcce0bfcf239af37cebbf /view/tpl/conv_list.tpl | |
parent | 696359daba11c51d8f733dfa173e48b5e1de69ef (diff) | |
parent | 5695350e98a8a2c802ff419c5b29b0f01f0180df (diff) | |
download | volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.tar.gz volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.tar.bz2 volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.zip |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'view/tpl/conv_list.tpl')
-rwxr-xr-x | view/tpl/conv_list.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl index 63e74b159..a0c2cf827 100755 --- a/view/tpl/conv_list.tpl +++ b/view/tpl/conv_list.tpl @@ -9,12 +9,12 @@ <div class="wall-item-outside-wrapper{{if $item.is_comment}} comment{{/if}}{{if $item.previewing}} preview{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="clearfix wall-item-content-wrapper{{if $item.is_comment}} comment{{/if}}" id="wall-item-content-wrapper-{{$item.id}}"> {{if $item.photo}} - <div class="wall-photo-item{{if $item.is_new && !$item.title}} wall-item-head-new rounded-top{{/if}}" id="wall-photo-item-{{$item.id}}"> + <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> {{$item.photo}} </div> {{/if}} {{if $item.event}} - <div class="wall-event-item{{if $item.is_new && !$item.title}} wall-item-head-new rounded-top{{/if}}" id="wall-event-item-{{$item.id}}"> + <div class="wall-event-item" id="wall-event-item-{{$item.id}}"> {{$item.event}} </div> {{/if}} @@ -26,7 +26,7 @@ <hr class="m-0"> {{/if}} {{/if}} - <div class="p-2 clearfix wall-item-head{{if $item.is_new && !$item.title && !$item.event && !$item.is_comment && !$item.photo}} wall-item-head-new rounded-top{{/if}}"> + <div class="p-2 clearfix wall-item-head{{if !$item.title && !$item.event && !$item.photo}} rounded-top{{/if}}{{if $item.is_new && !$item.event && !$item.is_comment}} wall-item-head-new{{/if}}"> <div class="wall-item-info" id="wall-item-info-{{$item.id}}" > <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}"> <img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /></a> |