mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2181
This commit is contained in:
commit
33d61d8cb5
@ -141,6 +141,10 @@
|
||||
float: left;
|
||||
}
|
||||
|
||||
.navbar-spacer {
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
#navbar-barcode-li {
|
||||
border-left: none;
|
||||
border-right: none;
|
||||
@ -545,7 +549,6 @@
|
||||
.inventree-body {
|
||||
width: 100%;
|
||||
padding: 5px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.inventree-pre-content {
|
||||
@ -562,10 +565,6 @@
|
||||
transition: 0.1s;
|
||||
}
|
||||
|
||||
.body {
|
||||
padding-top: 50px;
|
||||
}
|
||||
|
||||
.modal {
|
||||
overflow: hidden;
|
||||
z-index: 9999;
|
||||
|
@ -7,6 +7,8 @@
|
||||
{% inventree_title %} | {% trans "Index" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block breadcrumb_list %}
|
||||
{% endblock %}
|
||||
|
||||
{% block sidebar %}
|
||||
<!-- Sidebar data is filled dynamically for the index page-->
|
||||
|
@ -8,6 +8,9 @@
|
||||
{% inventree_title %} | {% trans "Search Results" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block breadcrumb_list %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class='panel panel-inventree'>
|
||||
|
@ -10,7 +10,10 @@
|
||||
<div class="navbar-header clearfix content-heading">
|
||||
<a class="navbar-brand" id='logo' href="{% url 'index' %}" style="padding-top: 7px; padding-bottom: 5px;"><img src="{% static 'img/inventree.png' %}" width="32" height="32" style="display:block; margin: auto;"/></a>
|
||||
</div>
|
||||
<div class="navbar-collapse collapse">
|
||||
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar-objects" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="navbar-collapse collapse" id="navbar-objects">
|
||||
<ul class="navbar-nav">
|
||||
{% if roles.part.view %}
|
||||
<li class='nav-item'>
|
||||
@ -108,3 +111,7 @@
|
||||
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
{% if sticky %}
|
||||
<div class='navbar-spacer'></div>
|
||||
{% endif %}
|
||||
|
Loading…
Reference in New Issue
Block a user