From 7f020cbbf61a8ac118c24db891dcaba08e1ce0e0 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 23 Apr 2020 19:41:14 +1000 Subject: [PATCH] Enbiggen a whole lotta buttons --- InvenTree/InvenTree/static/css/inventree.css | 32 ++++++++--------- .../InvenTree/static/script/inventree/part.js | 4 +-- .../build/templates/build/build_base.html | 14 ++++---- .../templates/company/company_base.html | 14 ++++---- .../order/templates/order/order_base.html | 14 ++++---- .../templates/order/sales_order_base.html | 6 ++-- InvenTree/part/templates/part/category.html | 14 ++++---- InvenTree/part/templates/part/part_base.html | 30 ++++++++-------- .../stock/templates/stock/item_base.html | 34 +++++++++---------- InvenTree/stock/templates/stock/location.html | 14 ++++---- InvenTree/templates/qr_button.html | 2 +- 11 files changed, 89 insertions(+), 89 deletions(-) diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 591a4a3760..19b92e2817 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -111,24 +111,20 @@ color: rgb(13, 245, 25); } -.glyphicon-ok { - color: #5C5; +.icon-red { + color: #c55; } -.glyphicon-ok-circle { +.icon-green { + color: #5c5; +} + +.icon-blue { color: #55c; } -.glyphicon-remove { - color: #C55; -} - -.glyphicon-trash { - color: #C55; -} - -.glyphicon-plus { - color: #5C5; +.icon-yellow { + color: #CC2; } /* CSS overrides for treeview */ @@ -330,11 +326,15 @@ padding-bottom: 2px; } -.btn-large { - font-size: 150%; +.action-buttons .btn { + font-size: 175%; align-content: center; vertical-align: middle; -} + padding-left: 6px; + padding-right: 6px; + padding-top: 3px; + padding-bottom: 2px; +}; .badge { float: right; diff --git a/InvenTree/InvenTree/static/script/inventree/part.js b/InvenTree/InvenTree/static/script/inventree/part.js index b7e5fc3155..92460a51a7 100644 --- a/InvenTree/InvenTree/static/script/inventree/part.js +++ b/InvenTree/InvenTree/static/script/inventree/part.js @@ -50,7 +50,7 @@ function toggleStar(options) { { method: 'POST', success: function(response, status) { - $(options.button).removeClass('glyphicon-star-empty').addClass('glyphicon-star'); + $(options.button).addClass('icon-yellow'); }, } ); @@ -64,7 +64,7 @@ function toggleStar(options) { { method: 'DELETE', success: function(response, status) { - $(options.button).removeClass('glyphicon-star').addClass('glyphicon-star-empty'); + $(options.button).removeClass('icon-yellow'); }, } ); diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index cd238a2299..f7c8ace219 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -22,21 +22,21 @@ src="{% static 'img/blank_image.png' %}"

{{ build.quantity }} x {{ build.part.full_name }}

-
- {% if build.is_active %} - {% endif %} {% if build.status == BuildStatus.CANCELLED %} {% endif %}
diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html index 8e1a743d10..da73a7b7b3 100644 --- a/InvenTree/company/templates/company/company_base.html +++ b/InvenTree/company/templates/company/company_base.html @@ -23,17 +23,17 @@ InvenTree | {% trans "Company" %} - {{ company.name }}

{{ company.name }}

{{ company.description }}

-
+
{% if company.is_supplier %} - {% endif %} - -
{% endblock %} diff --git a/InvenTree/order/templates/order/order_base.html b/InvenTree/order/templates/order/order_base.html index 3840457a5e..85d766a02e 100644 --- a/InvenTree/order/templates/order/order_base.html +++ b/InvenTree/order/templates/order/order_base.html @@ -26,27 +26,27 @@ src="{% static 'img/blank_image.png' %}"

{{ order.description }}

-
- - {% if order.status == OrderStatus.PENDING and order.lines.count > 0 %} - {% elif order.status == OrderStatus.PLACED %} - - {% endif %} {% if order.status == OrderStatus.PENDING or order.status == OrderStatus.PLACED %} - {% endif %} diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html index 77db9793dc..85eaeb6ba8 100644 --- a/InvenTree/order/templates/order/sales_order_base.html +++ b/InvenTree/order/templates/order/sales_order_base.html @@ -33,11 +33,11 @@ src="{% static 'img/blank_image.png' %}"

{{ order }}

{{ order.description }}

-
- -
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html index 9382259cce..672edfb587 100644 --- a/InvenTree/part/templates/part/category.html +++ b/InvenTree/part/templates/part/category.html @@ -14,16 +14,16 @@

{% trans "All parts" %}

{% endif %}

-

- {% if category %} - - {% endif %}
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index c4f0483ec2..0c329c72be 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -34,37 +34,37 @@

{{ part.description }}

-
- {% if part.is_template == False %} {% include "qr_button.html" %} {% if part.active %} - {% if not part.virtual %} - {% endif %} {% if part.purchaseable %} - {% endif %} {% endif %} {% endif %} - - {% if not part.active %} - {% endif %}
diff --git a/InvenTree/stock/templates/stock/item_base.html b/InvenTree/stock/templates/stock/item_base.html index e0a69e15fb..c90a062fa1 100644 --- a/InvenTree/stock/templates/stock/item_base.html +++ b/InvenTree/stock/templates/stock/item_base.html @@ -63,38 +63,38 @@ InvenTree | {% trans "Stock Item" %} - {{ item }} {% endif %} -
+
{% include "qr_button.html" %} {% if item.in_stock %} {% if not item.serialized %} - - - {% if item.part.trackable %} - {% endif %} {% endif %} - - {% endif %} - {% if item.can_delete %} - {% endif %}
diff --git a/InvenTree/stock/templates/stock/location.html b/InvenTree/stock/templates/stock/location.html index 7117e54c60..f7b5a7a70d 100644 --- a/InvenTree/stock/templates/stock/location.html +++ b/InvenTree/stock/templates/stock/location.html @@ -13,20 +13,20 @@

All stock items

{% endif %}

-

- {% if location %} {% include "qr_button.html" %} - {% endif %}
diff --git a/InvenTree/templates/qr_button.html b/InvenTree/templates/qr_button.html index 7aafd834bc..cc10e0cd26 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