harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

z-index issue and some icons. rename notifications-btn-1 to notifications-btn

Browse Source
This commit is contained in:
Mario Vavti 2017-10-11 21:32:23 +02:00
parent 05c8d4819d
commit 56a675f713
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
view/theme/redbasic/css/style.css
View File

@ -50,7 +50,7 @@ main {
height: 100%; height: 100%;
background: rgba(0, 0, 0, .5); background: rgba(0, 0, 0, .5);
cursor: pointer; cursor: pointer;
z-index: 1029; z-index: 1028;
} }
h1, .h1 { h1, .h1 {

2
view/theme/redbasic/js/redbasic.js
View File

@ -83,7 +83,7 @@ $(document).ready(function() {
}); });
var notifications_parent = $('#notifications_wrapper')[0].parentElement.id; var notifications_parent = $('#notifications_wrapper')[0].parentElement.id;
$('#notifications-btn-1').click(function() { $('#notifications-btn').click(function() {
if($('#notifications_wrapper').hasClass('fs')) if($('#notifications_wrapper').hasClass('fs'))
$('#notifications_wrapper').prependTo('#' + notifications_parent); $('#notifications_wrapper').prependTo('#' + notifications_parent);
else else

2
view/tpl/navbar_default.tpl
View File

@ -67,7 +67,7 @@
<i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i>
</button> </button>
{{if $localuser || $nav.pubs}} {{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> <i class="fa fa-exclamation-circle"></i>
</button> </button>
{{/if}} {{/if}}

10
view/tpl/notifications_widget.tpl
View File

@ -17,7 +17,7 @@
width: 100%; width: 100%;
max-width: 100%; max-width: 100%;
height: 100%; height: 100%;
z-index: 1025; z-index: 1029;
overflow: auto; overflow: auto;
} }
@ -44,10 +44,14 @@
</a> </a>
<div id="nav-{{$notification.type}}-menu" class="collapse notification-content" rel="{{$notification.type}}"> <div id="nav-{{$notification.type}}-menu" class="collapse notification-content" rel="{{$notification.type}}">
{{if $notification.viewall}} {{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}}
{{if $notification.markall}} {{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}} {{/if}}
{{$loading}} {{$loading}}
</div> </div>