[css] portal
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index 81a10c2..05181c0 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -1,7 +1,6 @@
{% macro product_image_square(website_image, css_class="") %}
<div class="product-image product-image-square {% if not website_image -%} missing-image {%- endif %} {{ css_class }}"
{% if website_image -%} style="background-image: url('{{ frappe.utils.quoted(website_image) | abs_url }}');" {%- endif %}>
- {% if not website_image -%}<i class="centered octicon octicon-device-camera"></i>{%- endif %}
</div>
{% endmacro %}
@@ -9,8 +8,6 @@
<div class="product-image {% if not website_image -%} missing-image {%- endif %} {{ css_class }}">
{% if website_image -%}
<img src="{{ frappe.utils.quoted(website_image) | abs_url }}" class="img-responsive">
- {%- else -%}
- <i class="centered octicon octicon-device-camera"></i>
{%- endif %}
</div>
{% endmacro %}
diff --git a/erpnext/templates/includes/order/order.css b/erpnext/templates/includes/order/order.css
deleted file mode 100644
index 54c8d0f..0000000
--- a/erpnext/templates/includes/order/order.css
+++ /dev/null
@@ -1,25 +0,0 @@
-.order-container {
- margin: 50px 0px;
-}
-
-.order-items {
- margin: 20px 0px;
-}
-
-.order-item-table {
- margin: 0px -15px;
-}
-
-.order-item-header {
- border-bottom: 1px solid #d1d8dd;
-}
-
-.order-image-col {
- padding-right: 0px;
-}
-
-.order-image {
- max-width: 55px;
- max-height: 55px;
- margin-top: -5px;
-}
diff --git a/erpnext/templates/includes/order/order_taxes.html b/erpnext/templates/includes/order/order_taxes.html
index 8c8e886..564e31e 100644
--- a/erpnext/templates/includes/order/order_taxes.html
+++ b/erpnext/templates/includes/order/order_taxes.html
@@ -1,20 +1,20 @@
{% if doc.taxes %}
<div class="row tax-net-total-row">
- <div class="col-xs-6 text-right">{{ _("Net Total") }}</div>
- <div class="col-xs-6 text-right">
+ <div class="col-xs-8 text-right">{{ _("Net Total") }}</div>
+ <div class="col-xs-4 text-right">
{{ doc.get_formatted("net_total") }}</div>
</div>
{% endif %}
{% for d in doc.taxes %}
-<div class="row tax-row">
- <div class="col-xs-6 text-right">{{ d.description }}</div>
- <div class="col-xs-6 text-right">
+<div class="row tax-row">
+ <div class="col-xs-8 text-right">{{ d.description }}</div>
+ <div class="col-xs-4 text-right">
{{ d.get_formatted("base_tax_amount") }}</div>
</div>
{% endfor %}
<div class="row tax-grand-total-row">
- <div class="col-xs-6 text-right">{{ _("Grand Total") }}</div>
- <div class="col-xs-6 text-right">
+ <div class="col-xs-8 text-right">{{ _("Grand Total") }}</div>
+ <div class="col-xs-4 text-right">
<span class="tax-grand-total">
{{ doc.get_formatted("grand_total") }}
</span>
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index a52bb60..05aed90 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -1,17 +1,27 @@
-<div class="web-list-item">
-<a href="/{{ pathname }}/{{ doc.name }}">
-<div class="row">
- <div class="col-sm-6">
+<div class="web-list-item transaction-list-item">
+ <a href="/{{ pathname }}/{{ doc.name }}">
+ <div class="row">
+ <div class="col-sm-6">
+ <span>{{ doc.name }}</span>
+ <div class="small text-muted items-preview text-ellipsis">
+ {{ doc.items_preview }}
+ </div>
+ </div>
+ <div class="col-sm-4">
+ <span class="indicator {{ doc.indicator_color or "darkgrey" }}">
+ {{ doc.indicator_title or doc.status }}
+ </span>
+ <div class="small text-muted transaction-time"
+ title="{{ frappe.utils.format_datetime(doc.modified, "medium") }}">
+ {{ frappe.utils.pretty_date(doc.modified) }}
+ </div>
+ </div>
+ <div class="col-sm-2 text-right">
+ {{ doc.get_formatted("grand_total") }}
+ </div>
+ <!-- <div class="col-sm-3 text-right">
- <span class="indicator {{ doc.indicator_color or "darkgrey" }}">{{ doc.name }}</span>
- <div class="small text-muted">{{ doc.items_preview }}</div>
-
- </div>
- <div class="col-sm-3 col-xs-5">
- {{ doc.get_formatted("grand_total") }}
- </div>
- <div class="col-sm-3 small text-muted text-right" title="{{ frappe.utils.format_datetime(doc.creation, "medium") }}">
- {{ frappe.utils.pretty_date(doc.creation) }}</div>
-</div>
-</a>
+ </div> -->
+ </div>
+ </a>
</div>