aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/theme/redbasic/js/redbasic.js2
-rwxr-xr-xview/tpl/navbar_default.tpl2
-rw-r--r--view/tpl/notifications_widget.tpl10
4 files changed, 10 insertions, 6 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 8b4a6ac82..aea75df65 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -50,7 +50,7 @@ main {
height: 100%;
background: rgba(0, 0, 0, .5);
cursor: pointer;
- z-index: 1029;
+ z-index: 1028;
}
h1, .h1 {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 4f71c1e73..04199ea95 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -83,7 +83,7 @@ $(document).ready(function() {
});
var notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
- $('#notifications-btn-1').click(function() {
+ $('#notifications-btn').click(function() {
if($('#notifications_wrapper').hasClass('fs'))
$('#notifications_wrapper').prependTo('#' + notifications_parent);
else
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 9495ea7a4..cf7235b14 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -67,7 +67,7 @@
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button>
{{if $localuser || $nav.pubs}}
- <button id="notifications-btn-1" type="button" class="navbar-toggler border-0 text-white">
+ <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white">
<i class="fa fa-exclamation-circle"></i>
</button>
{{/if}}
diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl
index 1c37fedff..6865879ad 100644
--- a/view/tpl/notifications_widget.tpl
+++ b/view/tpl/notifications_widget.tpl
@@ -17,7 +17,7 @@
width: 100%;
max-width: 100%;
height: 100%;
- z-index: 1025;
+ z-index: 1029;
overflow: auto;
}
@@ -44,10 +44,14 @@
</a>
<div id="nav-{{$notification.type}}-menu" class="collapse notification-content" rel="{{$notification.type}}">
{{if $notification.viewall}}
- <a class="list-group-item" id="nav-{{$notification.type}}-see-all" href="{{$notification.viewall.url}}">{{$notification.viewall.label}}</a>
+ <a class="list-group-item 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}}
{{if $notification.markall}}
- <a class="list-group-item" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">{{$notification.markall.label}}</a>
+ <a class="list-group-item text-dark" id="nav-{{$notification.type}}-mark-all" href="{{$notification.markall.url}}" onclick="markRead('{{$notification.type}}'); return false;">
+ <i class="fa fa-fw fa-check"></i> {{$notification.markall.label}}
+ </a>
{{/if}}
{{$loading}}
</div>