inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-18 21:15:41 +00:00
Code Activity

Fixes for bootstrap

Browse Source 
- Now using bootstrap3 which seems to work better
- Had to make changes to navbar and part image preview
This commit is contained in:
Oliver
2018-04-15 09:38:59 +10:00
parent 54e78bf468
commit ff2082b156
4 changed files with 18 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
InvenTree/part/templates/base.html
View File

@ -12,6 +12,7 @@
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<!-- Local stylesheet -->
<link rel="stylesheet" href="{% static 'css/inventree.css' %}">

34
InvenTree/part/templates/navbar.html
View File

@ -1,30 +1,14 @@
{% load static %}
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<a class="navbar-brand" href="#">
<img src="{% static 'img/inventree.png' %}" width="40" height="40"/>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/part/">Parts<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/stock/">Stock<span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="/supplier/">Suppliers<span class="sr-only">(current)</span></a>
</li>
<nav class="navbar navbar-default">
<div class="container-fluid">
<div class="navbar-header">
<a class="navbar-brand" href="/"><img src="{% static 'img/inventree.png' %}" width="40" height="40"/></a>
</div>
<ul class="nav navbar-nav">
<li class="active"><a href="/part/">Parts</a></li>
<li><a href="/stock/">Stock</a></li>
<li><a href="/supplier/">Suppliers</a></li>
</ul>
<!--
<form class="form-inline my-2 my-lg-0">
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
</form>
-->
</div>
</nav>

4
InvenTree/part/templates/part/part_base.html
View File

@ -7,12 +7,14 @@
{% include "part/cat_link.html" with category=part.category %}
<div class="media">
<img class="mr-3 part-thumb"
<div class="media-left">
<img class="part-thumb"
{% if part.image %}
src="{{ part.image.url }}"
{% else %}
src="{% static 'img/blank_image.png' %}"
{% endif %}/>
</div>
<div class="media-body">
<h5>{{ part.name }}</h5>
{% if part.description %}