From ff2082b1560b9aafa2295567f26be1a195c6de70 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Sun, 15 Apr 2018 09:38:59 +1000
Subject: [PATCH] Fixes for bootstrap

- Now using bootstrap3 which seems to work better
- Had to make changes to navbar and part image preview
---
 InvenTree/part/templates/base.html           |  1 +
 InvenTree/part/templates/navbar.html         | 34 +++-----
 InvenTree/part/templates/part/part_base.html |  4 +-
 InvenTree/static/css/inventree.css           | 81 ++------------------
 4 files changed, 18 insertions(+), 102 deletions(-)

diff --git a/InvenTree/part/templates/base.html b/InvenTree/part/templates/base.html
index 4d89b78c09..0124c9018d 100644
--- a/InvenTree/part/templates/base.html
+++ b/InvenTree/part/templates/base.html
@@ -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' %}">
 
diff --git a/InvenTree/part/templates/navbar.html b/InvenTree/part/templates/navbar.html
index 1f9a541940..d657373ccd 100644
--- a/InvenTree/part/templates/navbar.html
+++ b/InvenTree/part/templates/navbar.html
@@ -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>
\ No newline at end of file
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index daccb26837..d2d97b3b07 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -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 %}
diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css
index 4af0ac2488..3acb4b6e69 100644
--- a/InvenTree/static/css/inventree.css
+++ b/InvenTree/static/css/inventree.css
@@ -25,6 +25,10 @@ table tr:nth-child(odd) {
     background-color: #fff;
 }
 
+.navbar-brand {
+    float: left;
+}
+
 .badge {
     float: right;
     background-color: #777;
@@ -56,79 +60,4 @@ table tr:nth-child(odd) {
 .inventree-content {
     padding-left: 15px;
     padding-right: 15px;
-}
-
-.nav-tabs>.active li {
-    border-color: #d45500;
-    border-bottom-color: transparent;
-}
-
-.nav-tabs li {
-    padding-left: 10px;
-    padding-right: 10px;
-    border-bottom: 1px solid #d45500;
-}
-
-.tab-content {
-  color : white;
-  background-color: #428bca;
-  padding : 5px 15px;
-}
-
-.nav-tabs:after,
-.nav-pills:after {
-  clear: both;
-}
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px;
-}
-.nav-tabs {
-  border-bottom: 1px solid #ddd;
-  padding-top: 15px;
-  padding-bottom: 15px;
-}
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: 20px;
-  border: 1px solid transparent;
-  border-radius: 4px 4px 0 0;
-}
-.nav-tabs > li > a:hover,
-.nav-tabs > li > a:focus {
-  border-color: #eeeeee #eeeeee #dddddd;
-}
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: #555555;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-
-.panel-danger {
-    border-radius: 5px;
-    padding: 5px;
-    margin: 5px;
-    border-color: #ebccd1;
-}
-
-.panel-danger>.panel-heading {
-    background-color: #ebccd1;
-    border-top-left-radius: 3px;
-    border-top-right-radius: 3px;
-}
-
+}
\ No newline at end of file