Merge branch 'friendica:develop' into new_image_presentation
This commit is contained in:
commit
de83be11ac
1 changed files with 281 additions and 279 deletions
|
@ -1,4 +1,5 @@
|
||||||
<div id="item-{{$item.guid}}" class="item-{{$item.id}} wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}">
|
<div id="item-{{$item.guid}}" class="item-{{$item.id}}">
|
||||||
|
<div class="wall-item-container panel-body{{$item.indent}} {{$item.shiny}} {{$item.previewing}}">
|
||||||
<div class="media">
|
<div class="media">
|
||||||
{{* Put additional actions in a top-right dropdown menu *}}
|
{{* Put additional actions in a top-right dropdown menu *}}
|
||||||
|
|
||||||
|
@ -296,4 +297,5 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
</div><!--./media>-->
|
</div><!--./media>-->
|
||||||
|
</div><!--./scrollable-->
|
||||||
</div><!-- ./panel-body -->
|
</div><!-- ./panel-body -->
|
||||||
|
|
Loading…
Reference in a new issue