Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

This commit is contained in:
zotlabs
2017-05-22 03:51:58 -07:00
11 changed files with 276 additions and 73 deletions

View File

@@ -32,3 +32,9 @@
margin-top: 18px;
margin-left: 20px;
}
main {
max-width: 790px;
margin-left: auto;
margin-right: auto;
}

View File

@@ -1,11 +1,11 @@
<div class="generic-content-wrapper-styled">
<h1>{{$notif_header}}</h1>
{{if $notifications_available}}
<a href="#" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
{{/if}}
<div class="notif-network-wrapper">
{{$notif_content}}
</div>
<div class="generic-content-wrapper">
<div class="section-title-wrapper clearfix">
{{if $notifications_available}}
<a href="#" class="btn btn-outline-secondary btn-sm float-right" onclick="markRead('notify'); setTimeout(function() { window.location.href=window.location.href; },1500); return false;">{{$notif_link_mark_seen}}</a>
{{/if}}
<h2>{{$notif_header}}</h2>
</div>
<div class="section-content-wrapper">
{{$notif_content}}
</div>
</div>

View File

@@ -1,3 +1,3 @@
<div class="notif-item">
<a href="{{$item_link}}"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
<div class="mb-2 notif-item">
<a href="{{$item_link}}"><img src="{{$item_image}}" class="menu-img-1">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a>
</div>