inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-27 09:10:51 +00:00
Code Activity

Merge branch 'inventree:master' into matmair/issue2279

Browse Source
This commit is contained in:
Matthias Mair
2021-12-11 00:09:32 +01:00
committed by GitHub
parent c6b88c2f24 dfd7a439a6
commit 271ad1dc87
40 changed files with 25517 additions and 17226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
InvenTree/templates/base.html
View File

@ -74,13 +74,13 @@
<div class='row flex-nowrap inventree-body'>
<div class='col-auto px-1 sidebar-wrapper'>
<div id='sidebar' class='collapse collapse-horizontal show border-end' style='display: none;'>
<div id='sidebar' class='collapse collapse-horizontal show' style='display: none;'>
<div id='sidebar-nav' class='list-group text-sm-start'>
<ul id='sidebar-list-group' class='list-group sidebar-list-group'>
{% block sidebar %}
<!-- Sidebar goes here -->
{% endblock %}
{% include "sidebar_toggle.html" %}
{% include "sidebar_toggle.html" with target='sidebar' %}
</ul>
</div>
</div>
@ -104,14 +104,20 @@
{% endblock %}
{% block breadcrumb_list %}
<div class='container-fluid navigation'>
<div class='container-fluid navigation' id='breadcrumb-div'>
<nav aria-label='breadcrumb'>
<ol class='breadcrumb'>
<ol class='breadcrumb' id='breadcrumb-list'>
{% block breadcrumbs %}
{% endblock %}
</ol>
</nav>
<div id='breadcrumb-tree-collapse' class='collapse collapse-horizontal show border' style='display: none;'>
{% block breadcrumb_tree %}
{% endblock %}
</div>
</div>
{% endblock %}
{% block content %}