diff options
author | friendica <info@friendica.com> | 2014-05-04 17:11:29 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2014-05-04 17:11:29 -0700 |
commit | 3ae67c517ed8791332fb1ace2a0908209a6d0e0d (patch) | |
tree | 1fc92fb8399a423a4cc0249b1ad02b4b9310a01f /view | |
parent | fc550ae330102eed57905b423ff2d8b8a64b48d3 (diff) | |
parent | fc5ae78079e314a49390403943ed301da9a4c2ef (diff) | |
download | volse-hubzilla-3ae67c517ed8791332fb1ace2a0908209a6d0e0d.tar.gz volse-hubzilla-3ae67c517ed8791332fb1ace2a0908209a6d0e0d.tar.bz2 volse-hubzilla-3ae67c517ed8791332fb1ace2a0908209a6d0e0d.zip |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'view')
-rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
-rwxr-xr-x | view/tpl/notifications.tpl | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bc1dd9c74..a4373ed37 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1467,7 +1467,7 @@ div.jGrowl div.jGrowl-notification { .autocomplete { color: $font_colour; - background: #FFF; + background: $dropdown_bgcolour; cursor: pointer; text-align: left; max-height: 350px; diff --git a/view/tpl/notifications.tpl b/view/tpl/notifications.tpl index 3015de504..ae87c8ec8 100755 --- a/view/tpl/notifications.tpl +++ b/view/tpl/notifications.tpl @@ -1,5 +1,7 @@ <h1>{{$notif_header}}</h1> - +{{if $notifications_available}} +<a href="#" onclick="markRead('notify');">{{$notif_link_mark_seen}}</a> +{{/if}} <div class="notif-network-wrapper"> {{$notif_content}} </div> |