diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index cfa6846f10..18e772acfd 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -394,6 +394,13 @@ padding: .25em .5em; } +.table button { + font-size: 90%; + padding: 3px; + padding-left: 5px; + padding-right: 5px; +} + /* grid display for part images */ .table-img-grid tr { diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html index ea541899e0..e621b24763 100644 --- a/InvenTree/build/templates/build/detail.html +++ b/InvenTree/build/templates/build/detail.html @@ -277,7 +277,7 @@
- diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html index 8bfae7c13d..f0346b7984 100644 --- a/InvenTree/build/templates/build/index.html +++ b/InvenTree/build/templates/build/index.html @@ -40,10 +40,10 @@
- -
diff --git a/InvenTree/order/templates/order/order_wizard/match_fields.html b/InvenTree/order/templates/order/order_wizard/match_fields.html index c1a3618d8d..c7a9b02fd2 100644 --- a/InvenTree/order/templates/order/order_wizard/match_fields.html +++ b/InvenTree/order/templates/order/order_wizard/match_fields.html @@ -24,9 +24,9 @@ {% block form_buttons_top %} {% if wizard.steps.prev %} - + {% endif %} - + {% endblock form_buttons_top %} {% block form_content %} @@ -39,7 +39,7 @@
{{ col.name }} -
@@ -68,7 +68,7 @@ {% with forloop.counter as row_index %} - diff --git a/InvenTree/order/templates/order/order_wizard/match_parts.html b/InvenTree/order/templates/order/order_wizard/match_parts.html index 4f84d205ee..a8701c066c 100644 --- a/InvenTree/order/templates/order/order_wizard/match_parts.html +++ b/InvenTree/order/templates/order/order_wizard/match_parts.html @@ -16,9 +16,9 @@ {% block form_buttons_top %} {% if wizard.steps.prev %} - + {% endif %} - + {% endblock form_buttons_top %} {% block form_content %} @@ -48,7 +48,7 @@ {% for row in rows %} - diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html index 82800525fe..6c4902b141 100644 --- a/InvenTree/order/templates/order/order_wizard/po_upload.html +++ b/InvenTree/order/templates/order/order_wizard/po_upload.html @@ -54,9 +54,9 @@ {% block form_buttons_bottom %} {% if wizard.steps.prev %} - + {% endif %} - + {% endblock form_buttons_bottom %} diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html index e456b234b6..9d0ccdfb82 100644 --- a/InvenTree/order/templates/order/order_wizard/select_parts.html +++ b/InvenTree/order/templates/order/order_wizard/select_parts.html @@ -41,7 +41,7 @@ {{ part.full_name }} {{ part.description }} - @@ -74,7 +74,7 @@
- diff --git a/InvenTree/order/templates/order/order_wizard/select_pos.html b/InvenTree/order/templates/order/order_wizard/select_pos.html index 27f60212c1..6ef2f6c910 100644 --- a/InvenTree/order/templates/order/order_wizard/select_pos.html +++ b/InvenTree/order/templates/order/order_wizard/select_pos.html @@ -40,7 +40,7 @@ {{ supplier.order_items|length }} diff --git a/InvenTree/order/templates/order/purchase_orders.html b/InvenTree/order/templates/order/purchase_orders.html index 147f6bf244..cf509a68d2 100644 --- a/InvenTree/order/templates/order/purchase_orders.html +++ b/InvenTree/order/templates/order/purchase_orders.html @@ -21,13 +21,13 @@ {% trans "New Purchase Order" %} {% endif %} - - -
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html index 61f08b3032..6203b7909a 100644 --- a/InvenTree/order/templates/order/sales_order_detail.html +++ b/InvenTree/order/templates/order/sales_order_detail.html @@ -59,7 +59,7 @@
- diff --git a/InvenTree/order/templates/order/sales_orders.html b/InvenTree/order/templates/order/sales_orders.html index c04512dc1c..a4d4d27280 100644 --- a/InvenTree/order/templates/order/sales_orders.html +++ b/InvenTree/order/templates/order/sales_orders.html @@ -24,13 +24,13 @@ {% trans "New Sales Order" %} {% endif %} - - -
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html index 800e6972e7..89cacd7c3c 100644 --- a/InvenTree/part/templates/part/bom.html +++ b/InvenTree/part/templates/part/bom.html @@ -26,7 +26,7 @@
-
diff --git a/InvenTree/templates/hover_image.html b/InvenTree/templates/hover_image.html index 556a8db140..e9f781655b 100644 --- a/InvenTree/templates/hover_image.html +++ b/InvenTree/templates/hover_image.html @@ -1,6 +1,6 @@ {% load static %} -
+
{% if hover %} {% endif %} diff --git a/InvenTree/templates/js/translated/filters.js b/InvenTree/templates/js/translated/filters.js index 6b109e2d18..a2ef36f1d3 100644 --- a/InvenTree/templates/js/translated/filters.js +++ b/InvenTree/templates/js/translated/filters.js @@ -281,7 +281,7 @@ function setupFilterList(tableKey, table, target) { // One blank slate, please element.empty(); - element.append(``); + element.append(``); // Callback for reloading the table element.find(`#reload-${tableKey}`).click(function() { @@ -294,10 +294,10 @@ function setupFilterList(tableKey, table, target) { } // If there are filters currently "in use", add them in! - element.append(``); + element.append(``); if (Object.keys(filters).length > 0) { - element.append(``); + element.append(``); } for (var key in filters) { @@ -320,7 +320,7 @@ function setupFilterList(tableKey, table, target) { html += generateAvailableFilterList(tableKey); html += generateFilterInput(tableKey); - html += ``; + html += ``; element.append(html); diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js index a0c123a31b..ac255ddeef 100644 --- a/InvenTree/templates/js/translated/forms.js +++ b/InvenTree/templates/js/translated/forms.js @@ -564,7 +564,8 @@ function insertConfirmButton(options) {
-
`; +
+ `; $(options.modal).find('#modal-footer-buttons').append(html); diff --git a/InvenTree/templates/js/translated/helpers.js b/InvenTree/templates/js/translated/helpers.js index 984be5dea7..af28110b42 100644 --- a/InvenTree/templates/js/translated/helpers.js +++ b/InvenTree/templates/js/translated/helpers.js @@ -103,7 +103,7 @@ function makeIconBadge(icon, title) { */ function makeIconButton(icon, cls, pk, title, options={}) { - var classes = `btn btn-default ${cls}`; + var classes = `btn btn-outline-secondary ${cls}`; var id = `${cls}-${pk}`; diff --git a/InvenTree/templates/js/translated/modals.js b/InvenTree/templates/js/translated/modals.js index 993fbfb9cf..32b5260e76 100644 --- a/InvenTree/templates/js/translated/modals.js +++ b/InvenTree/templates/js/translated/modals.js @@ -71,6 +71,7 @@ function createNewModal(options={}) { +
@@ -787,7 +788,7 @@ function insertActionButton(modal, options) { if (already_present == false) { var html = ` - `; diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js index a0bd2d383b..c7df5e9dc7 100644 --- a/InvenTree/templates/js/translated/stock.js +++ b/InvenTree/templates/js/translated/stock.js @@ -1680,8 +1680,8 @@ function loadStockTrackingTable(table, options) { formatter: function(value, row, index, field) { // Manually created entries can be edited or deleted if (false && !row.system) { - var bEdit = ""; - var bDel = ""; + var bEdit = ""; + var bDel = ""; return "
" + bEdit + bDel + "
"; } else { diff --git a/InvenTree/templates/modals.html b/InvenTree/templates/modals.html index 28dbe0caf2..d36df97170 100644 --- a/InvenTree/templates/modals.html +++ b/InvenTree/templates/modals.html @@ -24,7 +24,7 @@
- +
@@ -47,7 +47,7 @@
- +
diff --git a/InvenTree/templates/qr_button.html b/InvenTree/templates/qr_button.html index 5ed65d32ab..c1878d054a 100644 --- a/InvenTree/templates/qr_button.html +++ b/InvenTree/templates/qr_button.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file