aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css5
-rw-r--r--view/tpl/app_nav.tpl2
-rw-r--r--view/tpl/navbar_default.tpl38
-rw-r--r--view/tpl/profile_tabs.tpl2
4 files changed, 26 insertions, 21 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 7207086b9..b0bd4fd75 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -52,9 +52,8 @@ nav .dropdown-menu {
transition: none;
}
-.offcanvas-end {
- width: unset;
- min-width: 250px;
+.offcanvas.offcanvas-end {
+ --bs-offcanvas-width: 19rem;
}
/* nav overrides end */
diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl
index c3a7bc8b6..a8489382e 100644
--- a/view/tpl/app_nav.tpl
+++ b/view/tpl/app_nav.tpl
@@ -1 +1 @@
-<a class="dropdown-item{{if $app.active}} active{{/if}}" href="{{$app.url}}" data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
+<a class="nav-link{{if $app.active}} active{{/if}}" href="{{$app.url}}" data-papp="{{$app.papp}}" data-icon="{{$icon}}" data-url="{{$app.url}}" data-name="{{$app.name}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a>
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 0dccd4404..06e764a54 100644
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -179,7 +179,7 @@
</a>
{{/if}}
</div>
- <div class="d-lg-flex"></div>
+ <div class="nav d-lg-flex"></div>
{{else}}
<div class="lh-1" id="app-bin-label">
{{if $name}}
@@ -196,43 +196,49 @@
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
</div>
- <div class="offcanvas-body pt-0">
+ <div class="offcanvas-body">
{{if $channel_apps.0}}
- <div class="dropdown-header text-uppercase text-muted">
+ <div class="text-uppercase text-muted">
{{$channelapps}}
</div>
- {{foreach $channel_apps as $channel_app}}
- {{$channel_app}}
- {{/foreach}}
+ <div class="nav nav-pills flex-column">
+ {{foreach $channel_apps as $channel_app}}
+ {{$channel_app}}
+ {{/foreach}}
+ </div>
{{/if}}
{{if $navbar_apps.0}}
<div class="d-lg-none dropdown-header text-uppercase text-muted">
{{$pinned_apps}}
</div>
- <div id="nav-app-bin-container" class="d-lg-none">
+ <div id="nav-app-bin-container" class="d-lg-none nav nav-pills flex-column">
{{foreach $navbar_apps as $navbar_app}}
- {{$navbar_app|replace:'navbar-app nav-link':'dropdown-item nav-app-sortable'|replace:'fa':'generic-icons-nav fa'}}
+ {{$navbar_app|replace:'fa':'generic-icons-nav fa'}}
{{/foreach}}
</div>
{{/if}}
{{if $is_owner}}
- <div class="dropdown-header text-uppercase text-muted">
+ <div class="text-uppercase text-muted nav-link">
{{$featured_apps}}
</div>
- <div id="app-bin-container" data-token="{{$form_security_token}}">
+ <div id="app-bin-container" data-token="{{$form_security_token}}" class="nav nav-pills flex-column">
{{foreach $nav_apps as $nav_app}}
{{$nav_app}}
{{/foreach}}
</div>
- <div class="dropdown-divider"></div>
- <a class="dropdown-item" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus"></i>{{$addapps}}</a>
+ <hr>
+ <div class="nav nav-pills flex-column">
+ <a class="nav-link" href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus"></i>{{$addapps}}</a>
+ </div>
{{else}}
- <div class="dropdown-header text-uppercase text-muted">
+ <div class="text-uppercase text-muted nav-link">
{{$sysapps}}
</div>
- {{foreach $nav_apps as $nav_app}}
- {{$nav_app}}
- {{/foreach}}
+ <div class="nav nav-pills flex-column">
+ {{foreach $nav_apps as $nav_app}}
+ {{$nav_app}}
+ {{/foreach}}
+ </div>
{{/if}}
</div>
</div>
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
index 84ebf12bd..3cabad83d 100644
--- a/view/tpl/profile_tabs.tpl
+++ b/view/tpl/profile_tabs.tpl
@@ -1,3 +1,3 @@
{{foreach $tabs as $tab}}
-<a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
+<a class="nav-link{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
{{/foreach}}