aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-10-19 08:44:44 +0000
committerMario <mario@mariovavti.com>2020-10-19 08:44:44 +0000
commitcef0c2ebb2b16b006eca7dce8ec0b1a95d916dba (patch)
tree906d6b166fcd716af6b21455070bbd63b99e8b1b
parent5e0f5460f2ee92aecc53fd900e55d54fa5326fc5 (diff)
downloadvolse-hubzilla-cef0c2ebb2b16b006eca7dce8ec0b1a95d916dba.tar.gz
volse-hubzilla-cef0c2ebb2b16b006eca7dce8ec0b1a95d916dba.tar.bz2
volse-hubzilla-cef0c2ebb2b16b006eca7dce8ec0b1a95d916dba.zip
highlight events for today in notifications and remove some redundant css
-rw-r--r--Zotlabs/Lib/Enotify.php4
-rw-r--r--view/css/bootstrap-red.css27
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/tpl/notifications_widget.tpl14
4 files changed, 9 insertions, 38 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index 03a824b9b..c78325ee3 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -966,8 +966,8 @@ class Enotify {
'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'],
'when' => $when,
- 'hclass' => ('notify-unseen'),
- 'message' => t('posted an event')
+ 'hclass' => (($today) ? 'notify-unseen bg-warning' : 'notify-unseen'),
+ 'message' => t('created an event')
];
return $x;
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 984a5b4f9..122bb5904 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -11,29 +11,6 @@ nav .dropdown-menu {
min-width: 16rem;
}
-@media screen and (min-width: 992px) {
- nav .badge {
- top: 0px;
- left: 0px;
- line-height: 0.75;
- }
-}
-
-@media screen and (max-width: 992px) {
- .navbar {
- padding: .5rem 7px;
- }
-
- nav .badge {
- top: 0.5rem;
- left: 1.5rem;
- }
-}
-
-.widget .badge {
- font-size: 100%;
-}
-
.nav-item.nav-item-hack {
height: 2.3rem;
}
@@ -77,10 +54,6 @@ nav .dropdown-menu {
}
/* nav overrides end */
-.list-group-item:hover {
- text-decoration: none;
-}
-
label {
font-weight: bold;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 08a6e9d19..545e610b5 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -799,8 +799,6 @@ div.jGrowl div.jGrowl-notification {
}
.contactname {
- font-weight: bold;
- color: $font_colour;
display: block;
overflow: hidden;
text-overflow: ellipsis;
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 3844ae2bf..70b847ee5 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -142,15 +142,15 @@
{{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span>
</div>
<div id="nav-notifications-template" rel="template">
- <a class="list-group-item clearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
+ <a class="list-group-item text-decoration-none text-darkclearfix notification {6}" href="{0}" title="{13}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-when="{5}">
<img class="menu-img-3" data-src="{1}">
- <span class="contactname">{2} <span class="font-weight-normal text-muted">{3}</span></span>
- <span class="dropdown-sub-text">{4}</span><br>
- <span class="dropdown-sub-text notifications-autotime" title="{5}">{5}</span>
+ <div class="contactname"><span class="text-dark font-weight-bold">{2}</span> <span class="text-muted">{3}</span></div>
+ <span class="text-muted">{4}</span><br>
+ <span class="text-muted notifications-autotime" title="{5}">{5}</span>
</a>
</div>
<div id="nav-notifications-forums-template" rel="template">
- <a class="list-group-item clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'>
+ <a class="list-group-item text-decoration-none clearfix notification notification-forum" href="{0}" title="{4} - {3}" data-b64mid="{7}" data-notify_id="{8}" data-thread_top="{9}" data-contact_name="{2}" data-contact_addr="{3}" data-b64mids='{12}'>
<span class="float-right badge badge-secondary">{10}</span>
<img class="menu-img-1" data-src="{1}">
<span class="">{2}</span>
@@ -160,13 +160,13 @@
<div id="notifications" class="border border-bottom-0 rounded navbar-nav collapse">
{{foreach $notifications as $notification}}
<div class="rounded list-group list-group-flush collapse {{$notification.type}}-button">
- <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-sse_type="{{$notification.type}}">
+ <a id="notification-link-{{$notification.type}}" class="collapsed list-group-item text-decoration-none notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-sse_type="{{$notification.type}}">
<i class="fa fa-fw fa-{{$notification.icon}}"></i> {{$notification.label}}
<span class="float-right badge badge-{{$notification.severity}} {{$notification.type}}-update"></span>
</a>
<div id="nav-{{$notification.type}}-sub" class="list-group list-group-flush border border-left-0 border-top-0 border-right-0 collapse notification-content" data-parent="#notifications" data-sse_type="{{$notification.type}}">
{{if $notification.viewall}}
- <a class="list-group-item text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">
+ <a class="list-group-item text-decoration-none text-dark" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">
<i class="fa fa-fw fa-external-link"></i> {{$notification.viewall.label}}
</a>
{{/if}}