diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-22 03:51:58 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-22 03:51:58 -0700 |
| commit | 1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d (patch) | |
| tree | 30f9100f61e54bd800d859af3dc45dcab56e5cee /view | |
| parent | 36a960adec9f216463890640340324d6d37a65d0 (diff) | |
| parent | 50e9d024581ddf57f37a6302bc089a88237657bb (diff) | |
| download | volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.gz volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.tar.bz2 volse-hubzilla-1c8c7479b85dfc66b63b622acaa48d0e2dd5b86d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_setup.css | 6 | ||||
| -rwxr-xr-x | view/tpl/notifications.tpl | 20 | ||||
| -rwxr-xr-x | view/tpl/notify.tpl | 4 |
3 files changed, 18 insertions, 12 deletions
diff --git a/view/css/mod_setup.css b/view/css/mod_setup.css index ee725d055..f0d91a0ae 100644 --- a/view/css/mod_setup.css +++ b/view/css/mod_setup.css @@ -32,3 +32,9 @@ margin-top: 18px; margin-left: 20px; } + +main { + max-width: 790px; + margin-left: auto; + margin-right: auto; +} diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 0b24da7c3..53ff8de52 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -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> diff --git a/view/tpl/notify.tpl b/view/tpl/notify.tpl index d3c79be82..ae6e160b1 100755 --- a/view/tpl/notify.tpl +++ b/view/tpl/notify.tpl @@ -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> |