fix: Font size, empty image styles, and minor cleanup
- some frappe css font variables weren't loading, remove dependency
- fixed fallback display for missing images in views
- py code cleanup (minor)
diff --git a/erpnext/templates/includes/cart/address_card.html b/erpnext/templates/includes/cart/address_card.html
index 667144b..830ed64 100644
--- a/erpnext/templates/includes/cart/address_card.html
+++ b/erpnext/templates/includes/cart/address_card.html
@@ -1,5 +1,5 @@
<div class="card address-card h-100">
- <div class="btn btn-sm btn-default btn-change-address" style="position: absolute; right: 0; top: 0;">
+ <div class="btn btn-sm btn-default btn-change-address font-md" style="position: absolute; right: 0; top: 0;">
{{ _('Change') }}
</div>
<div class="card-body p-0">
diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index a9377f3..4f391e1 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -8,9 +8,9 @@
{% if show_coupon_code == 1%}
<div class="mb-3">
<div class="row no-gutters">
- <input type="text" class="txtcoupon form-control mr-3 w-25" placeholder="Enter Coupon Code" name="txtcouponcode" ></input>
- <button class="btn btn-primary btn-sm bt-coupon">{{ _("Apply Coupon Code") }}</button>
- <input type="hidden" class="txtreferral_sales_partner" placeholder="Enter Sales Partner" name="txtreferral_sales_partner" type="text"></input>
+ <input type="text" class="txtcoupon form-control mr-3 w-50 font-md" placeholder="Enter Coupon Code" name="txtcouponcode" ></input>
+ <button class="btn btn-primary btn-sm bt-coupon font-md">{{ _("Apply Coupon Code") }}</button>
+ <input type="hidden" class="txtreferral_sales_partner font-md" placeholder="Enter Sales Partner" name="txtreferral_sales_partner" type="text"></input>
</div>
</div>
{% endif %}
@@ -30,7 +30,7 @@
<div class="checkbox ml-1 mb-2">
<label for="input_same_billing">
<input type="checkbox" id="input_same_billing" checked>
- <span class="label-area">{{ _('Billing Address is same as Shipping Address') }}</span>
+ <span class="label-area font-md">{{ _('Billing Address is same as Shipping Address') }}</span>
</label>
</div>
<div class="mb-3 frappe-card p-5" data-section="billing-address">
@@ -46,7 +46,9 @@
{% endif %}
{% endfor %}
</div>
-<button class="btn btn-outline-primary btn-sm mt-1 btn-new-address bg-white">{{ _("Add a new address") }}</button>
+<button class="btn btn-outline-primary btn-sm mt-1 btn-new-address bg-white font-md">
+ {{ _("Add a new address") }}
+</button>
<script>
frappe.ready(() => {
@@ -125,7 +127,8 @@
{
fieldname: "phone",
fieldtype: "Data",
- label: "Phone"
+ label: "Phone",
+ reqd: 1
},
],
primary_action_label: __('Save'),
diff --git a/erpnext/templates/includes/macros.html b/erpnext/templates/includes/macros.html
index e3511de..2224fdc 100644
--- a/erpnext/templates/includes/macros.html
+++ b/erpnext/templates/includes/macros.html
@@ -138,33 +138,30 @@
{%- macro wishlist_card(item, settings) %}
+{%- set title = item.item_name or item.item_code -%}
+{%- set title = title[:50] + "..." if title|len > 50 else title -%}
<div class="col-sm-3 wishlist-card">
<div class="card text-center" style="max-height: 390px;">
- {% if item.image %}
- <div class="card-img-container">
- <a href="/{{ item.route or '#' }}" style="text-decoration: none;">
+ <div class="card-img-container">
+ <a href="/{{ item.route or '#' }}" style="text-decoration: none;">
+ {% if item.image %}
<img class="card-img" src="{{ item.image }}" alt="{{ title }}">
- </a>
- <div class="remove-wish" data-item-code="{{ item.item_code }}">
- <span style="padding-bottom: 2px;">
- <svg class="icon sm remove-wish-icon" style="margin-bottom: 4px; margin-left: 0.5px;">
- <use class="close" href="#icon-close"></use>
- </svg>
- </span>
- </div>
-
+ {% else %}
+ <div class="card-img-top no-image">
+ {{ frappe.utils.get_abbr(title) }}
+ </div>
+ {% endif %}
+ </a>
+ <div class="remove-wish" data-item-code="{{ item.item_code }}">
+ <span style="padding-bottom: 2px;">
+ <svg class="icon sm remove-wish-icon" style="margin-bottom: 4px; margin-left: 0.5px;">
+ <use class="close" href="#icon-close"></use>
+ </svg>
+ </span>
</div>
- {% else %}
- <a href="/{{ item.route or '#' }}" style="text-decoration: none;">
- <div class="card-img-top no-image">
- {{ frappe.utils.get_abbr(title) }}
- </div>
- </a>
- {% endif %}
+ </div>
{{ wishlist_card_body(item, settings) }}
-
-
</div>
</div>
{%- endmacro -%}