From ae2c3e8293c3564073d6b516af394fe50cfe21ef Mon Sep 17 00:00:00 2001 From: Oliver Date: Thu, 28 Oct 2021 08:31:36 +1100 Subject: [PATCH] remove "panel-inventree" references --- InvenTree/InvenTree/static/css/inventree.css | 32 +++++++++++-------- InvenTree/build/templates/build/detail.html | 14 ++++---- .../company/templates/company/detail.html | 14 ++++---- .../templates/company/manufacturer_part.html | 4 +-- .../templates/company/supplier_part.html | 6 ++-- .../order/order_wizard/po_upload.html | 2 +- .../order/purchase_order_detail.html | 8 ++--- .../templates/order/sales_order_detail.html | 8 ++--- .../part/bom_upload/upload_file.html | 2 +- InvenTree/part/templates/part/category.html | 6 ++-- InvenTree/part/templates/part/detail.html | 32 +++++++++---------- .../part/import_wizard/part_upload.html | 2 +- InvenTree/stock/templates/stock/item.html | 12 +++---- InvenTree/stock/templates/stock/location.html | 4 +-- InvenTree/templates/InvenTree/index.html | 6 ++-- InvenTree/templates/InvenTree/search.html | 6 ++-- InvenTree/templates/js/translated/modals.js | 4 +-- InvenTree/templates/js/translated/part.js | 2 +- InvenTree/templates/navbar.html | 2 +- InvenTree/templates/page_base.html | 2 +- InvenTree/templates/panel.html | 2 +- 21 files changed, 87 insertions(+), 83 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index a681ce321a..6a4f625284 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -1,8 +1,9 @@ :root { --primary-color: #335d88; - --secondary-color: #b69c80; + --secondary-color: #dcdcda; --highlight-color: #f5efe8; - --basic-color: #333; + + --border-color: #ccc; --label-red: #e35a57; --label-blue: #4194bd; @@ -130,6 +131,7 @@ .navbar { border-bottom: 1px solid #ccc; + background-color: var(--secondary-color); } .navbar-brand { @@ -652,10 +654,13 @@ } .modal-header { - border-bottom: 1px solid #ccc; - background-color: #dcdcdc; - color: #555; - padding: 10px; + padding: 3px; + padding-top: 5px; + padding-left: 15px; + padding-right: 25px; + color: var(--bs-body-color); + background-color: var(--secondary-color); + border-bottom: 1px solid var(--border-color); } .modal-footer { @@ -929,25 +934,24 @@ input[type="submit"] { padding: 10px; } -.panel-group .panel { +.panel-group { border-radius: 2px; } .panel-heading { - padding: 5px 10px; + padding: 3px; + padding-top: 5px; padding-left: 15px; - padding-top: 10px; - color: #333; - background-color: #dcdcdc; - border-bottom: 1px solid #ccc; + color: var(--bs-body-color); + background-color: var(--secondary-color); + border-bottom: 1px solid var(--border-color); } -.panel-inventree { +.panel { box-shadow: 2px 2px #DDD; margin-bottom: 20px; background-color: #fff; border: 1px solid #ccc; - border-radius: 5px; } .panel-hidden { diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html index c1cfed21bf..ea541899e0 100644 --- a/InvenTree/build/templates/build/detail.html +++ b/InvenTree/build/templates/build/detail.html @@ -10,7 +10,7 @@ {% block page_content %} -
+

{% trans "Build Details" %}

@@ -152,7 +152,7 @@
-
+

{% trans "Child Build Orders" %}

@@ -168,7 +168,7 @@
-
+

{% trans "Allocate Stock to Build" %}

@@ -219,7 +219,7 @@
-
+

{% trans "Incomplete Build Outputs" %}

@@ -248,7 +248,7 @@
-
+

{% trans "Completed Build Outputs" %} @@ -260,7 +260,7 @@

-
+

{% trans "Attachments" %}

@@ -269,7 +269,7 @@
-
+
diff --git a/InvenTree/company/templates/company/detail.html b/InvenTree/company/templates/company/detail.html index 418fc38e65..8ac4f53af1 100644 --- a/InvenTree/company/templates/company/detail.html +++ b/InvenTree/company/templates/company/detail.html @@ -9,7 +9,7 @@ {% block page_content %} -
+

{% trans "Supplier Parts" %}

@@ -53,7 +53,7 @@
-
+

{% trans "Manufacturer Parts" %}

@@ -96,7 +96,7 @@
-
+

{% trans "Supplier Stock" %}

@@ -105,7 +105,7 @@
-
+

{% trans "Purchase Orders" %}

@@ -127,7 +127,7 @@
-
+

{% trans "Sales Orders" %}

@@ -150,7 +150,7 @@
-
+

{% trans "Assigned Stock" %}

@@ -166,7 +166,7 @@
-
+
diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html index 6339cb0545..3009b0f141 100644 --- a/InvenTree/company/templates/company/manufacturer_part.html +++ b/InvenTree/company/templates/company/manufacturer_part.html @@ -100,7 +100,7 @@ src="{% static 'img/blank_image.png' %}" {% block page_content %} -
+

{% trans "Suppliers" %}

@@ -124,7 +124,7 @@ src="{% static 'img/blank_image.png' %}"
-
+

{% trans "Parameters" %}

diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html index b6e3a4507e..73cb5277c6 100644 --- a/InvenTree/company/templates/company/supplier_part.html +++ b/InvenTree/company/templates/company/supplier_part.html @@ -133,7 +133,7 @@ src="{% static 'img/blank_image.png' %}" {% block page_content %} -
+

{% trans "Supplier Part Stock" %}

@@ -142,7 +142,7 @@ src="{% static 'img/blank_image.png' %}"
-
+

{% trans "Supplier Part Orders" %}

@@ -160,7 +160,7 @@ src="{% static 'img/blank_image.png' %}"
-
+

{% trans "Pricing Information" %}

diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html index 35cf552159..82800525fe 100644 --- a/InvenTree/order/templates/order/order_wizard/po_upload.html +++ b/InvenTree/order/templates/order/order_wizard/po_upload.html @@ -21,7 +21,7 @@ {% block page_content %} -
+
{% block heading %}

{% trans "Upload File for Purchase Order" %}

diff --git a/InvenTree/order/templates/order/purchase_order_detail.html b/InvenTree/order/templates/order/purchase_order_detail.html index b3b03fb31d..ceda5fdd02 100644 --- a/InvenTree/order/templates/order/purchase_order_detail.html +++ b/InvenTree/order/templates/order/purchase_order_detail.html @@ -12,7 +12,7 @@ {% block page_content %} -
+

{% trans "Purchase Order Items" %}

@@ -42,7 +42,7 @@
-
+

{% trans "Received Items" %}

@@ -51,7 +51,7 @@
-
+

{% trans "Purchase Order Attachments" %}

@@ -60,7 +60,7 @@
-
+
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html index c6b97b6847..61f08b3032 100644 --- a/InvenTree/order/templates/order/sales_order_detail.html +++ b/InvenTree/order/templates/order/sales_order_detail.html @@ -12,7 +12,7 @@ {% block page_content %} -
+

{% trans "Sales Order Items" %}

@@ -33,7 +33,7 @@
-
+

{% trans "Build Orders" %}

@@ -42,7 +42,7 @@
-
+

{% trans "Attachments" %}

@@ -51,7 +51,7 @@
-
+
diff --git a/InvenTree/part/templates/part/bom_upload/upload_file.html b/InvenTree/part/templates/part/bom_upload/upload_file.html index 38d7792dd1..253dcb04d8 100644 --- a/InvenTree/part/templates/part/bom_upload/upload_file.html +++ b/InvenTree/part/templates/part/bom_upload/upload_file.html @@ -21,7 +21,7 @@ {% block page_content %} -
+
{% block heading %}

{% trans "Upload Bill of Materials" %}

diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html index e5a22363b2..54f8b81e0a 100644 --- a/InvenTree/part/templates/part/category.html +++ b/InvenTree/part/templates/part/category.html @@ -112,7 +112,7 @@ {% endfor %} {% endif %} -
+

{% trans "Parts" %}

@@ -157,7 +157,7 @@
-
+

{% trans "Part Parameters" %}

@@ -167,7 +167,7 @@
-
+

{% trans "Subcategories" %}

diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html index 1b1da5f14d..0de35ea454 100644 --- a/InvenTree/part/templates/part/detail.html +++ b/InvenTree/part/templates/part/detail.html @@ -11,7 +11,7 @@ {% block page_content %} -
+

{% trans "Part Details" %}

@@ -93,7 +93,7 @@
-
+

{% trans "Part Stock" %}

@@ -107,7 +107,7 @@
-
+

{% trans "Part Test Templates" %}

@@ -127,7 +127,7 @@
-
+

{% trans "Purchase Orders" %}

@@ -148,7 +148,7 @@
-
+

{% trans "Sales Orders" %}

@@ -176,11 +176,11 @@
-
+
{% include "part/prices.html" %}
-
+
@@ -203,11 +203,11 @@
-
+
-
+

{% trans "Part Variants" %}

@@ -232,7 +232,7 @@
-
+

{% trans "Parameters" %}

@@ -250,7 +250,7 @@
-
+

{% trans "Attachments" %}

@@ -259,7 +259,7 @@
- -
+

{% trans "Bill of Materials" %}

@@ -314,7 +314,7 @@
-
+

{% trans "Assemblies" %}

@@ -330,7 +330,7 @@
-
+

{% trans "Part Builds" %}

@@ -360,7 +360,7 @@
-
+

{% trans "Part Suppliers" %}

diff --git a/InvenTree/part/templates/part/import_wizard/part_upload.html b/InvenTree/part/templates/part/import_wizard/part_upload.html index 344cd3e881..8e4a71b5bf 100644 --- a/InvenTree/part/templates/part/import_wizard/part_upload.html +++ b/InvenTree/part/templates/part/import_wizard/part_upload.html @@ -20,7 +20,7 @@ {% endblock %} {% block content %} -
+

{% trans "Import Parts from File" %} diff --git a/InvenTree/stock/templates/stock/item.html b/InvenTree/stock/templates/stock/item.html index 172c0e0a7f..db8de8b495 100644 --- a/InvenTree/stock/templates/stock/item.html +++ b/InvenTree/stock/templates/stock/item.html @@ -12,7 +12,7 @@ {% block page_content %} -
+

{% trans "Stock Tracking Information" %}

@@ -38,7 +38,7 @@
-
+

{% trans "Child Stock Items" %}

@@ -53,7 +53,7 @@
-
+

{% trans "Test Data" %}

@@ -83,7 +83,7 @@
-
+

{% trans "Attachments" %}

@@ -92,7 +92,7 @@
-
+
@@ -115,7 +115,7 @@
-
+

{% trans "Installed Stock Items" %}

diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html index 7735be69b8..86e6a91fc0 100644 --- a/InvenTree/stock/templates/stock/location.html +++ b/InvenTree/stock/templates/stock/location.html @@ -134,7 +134,7 @@ {% block page_content %} -
+

{% trans "Stock Items" %}

@@ -143,7 +143,7 @@
-
+

{% trans "Sublocations" %}

diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html index 1eae7ebdc8..147d22d6c3 100644 --- a/InvenTree/templates/InvenTree/index.html +++ b/InvenTree/templates/InvenTree/index.html @@ -12,14 +12,14 @@
-
+
    -
  • +
  • @@ -56,7 +56,7 @@ function addHeaderAction(label, title, icon, options) { // Add a detail item to the detail item-panel $("#detail-item-list").append( - `
  • + `

  • ${title}

    • ` diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html index d2cd74ad26..63db62cffa 100644 --- a/InvenTree/templates/InvenTree/search.html +++ b/InvenTree/templates/InvenTree/search.html @@ -26,14 +26,14 @@ {% endif %}
    -
    +
      -
    • +
    • @@ -69,7 +69,7 @@ // Add a results table $('#search-result-list').append( - `
    • + `

    • ${title}

      • ` diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js index e50970ed23..993fbfb9cf 100644 --- a/InvenTree/templates/js/translated/modals.js +++ b/InvenTree/templates/js/translated/modals.js @@ -47,9 +47,9 @@ function createNewModal(options={}) {
      - +

diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js index 9cebec9995..f7a64d2f06 100644 --- a/InvenTree/templates/js/translated/part.js +++ b/InvenTree/templates/js/translated/part.js @@ -792,7 +792,7 @@ function partGridTile(part) { var html = `
-
+
${part.full_name} diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html index 416ad011d3..59f4286b40 100644 --- a/InvenTree/templates/navbar.html +++ b/InvenTree/templates/navbar.html @@ -5,7 +5,7 @@ {% settings_value 'BARCODE_ENABLE' as barcodes %} {% settings_value 'STICKY_HEADER' user=request.user as sticky %} -