diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-10-09 13:35:58 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-10-09 13:35:58 +0200 |
| commit | 54a06903230ad87570b3a37161fa888dd38cb389 (patch) | |
| tree | 45d69a11e941f520a9c7cceddd1f030f8c1d6ae2 /view/tpl | |
| parent | ec173e7eb2e0b4a0768606365f6463009900f0ea (diff) | |
| download | volse-hubzilla-54a06903230ad87570b3a37161fa888dd38cb389.tar.gz volse-hubzilla-54a06903230ad87570b3a37161fa888dd38cb389.tar.bz2 volse-hubzilla-54a06903230ad87570b3a37161fa888dd38cb389.zip | |
more new notifications fixes
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 9 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 30 |
2 files changed, 17 insertions, 22 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index a19fa15a1..bbc5b4fb0 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -53,6 +53,9 @@ </div> {{/if}} </div> +<div class="navbar-nav mr-auto"> + <div class="text-white">{{$sel.active}}</div> +</div> {{/if}} <div class="navbar-toggler-right"> {{if $nav.help.6}} @@ -60,7 +63,7 @@ <i class="fa fa-question-circle"></i> </button> {{/if}} - <button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> + <button id="expand-aside" type="button" class="d-md-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> </button> {{if ! $experimental_notif}} @@ -212,9 +215,7 @@ {{/if}} </ul> {{else}} - <div class="navbar-nav mr-auto"> - <div class="text-white">{{$sel.active}}</div> - </div> + <div class="navbar-text mr-auto d-none d-xl-flex"></div> {{/if}} <div id="banner" class="navbar-text d-none d-xl-flex">{{$banner}}</div> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 83174b3a1..26004338d 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -16,33 +16,27 @@ } .fs { - position: fixed; - top: 0px; + top: 0px !important; left: 0px; - display: block !important; + padding-top: 4.5rem !important; background-color: white; - width: 100%; + width: 100% !important; max-width: 100%; height: 100vh; - z-index: 1020; - } - - .fs #notifications { - position: relative; - width: 100%; - top: 0px; + z-index: 1030; } </style> -<div id="nav-notifications-template" rel="template"> - <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"> - <img class="menu-img-3" data-src="{1}"> - <span class="contactname">{2}</span> - <span class="dropdown-sub-text">{3}<br>{4}</span> - </a> -</div> + <div id="notifications" class="navbar-nav" data-children=".nav-item"> + <div id="nav-notifications-template" rel="template"> + <a class="dropdown-item clearfix dropdown-notification {5}" href="{0}" title="{2} {3}"> + <img class="menu-img-3" data-src="{1}"> + <span class="contactname">{2}</span> + <span class="dropdown-sub-text">{3}<br>{4}</span> + </a> + </div> {{foreach $notifications as $notification}} <div class="collapse {{$notification.type}}-button"> <a class="list-group-item" href="#nav-{{$notification.type}}-menu" title="{{$notification.title}}" data-toggle="collapse" data-parent="#notifications" rel="#nav-{{$notification.type}}-menu"> |