nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-04 12:49:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29953 from marination/heart-icon-and-shop-by-category

Browse Source 
chore: Adjust heart icon to v14 icons in frappe (make consistent with v13) & misc fix
This commit is contained in:
Marica
2022-02-23 13:01:30 +05:30
committed by GitHub
parent 1bdcb73d5d 714325071f
commit 856d3f63b5
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/public/scss/shopping_cart.scss
View File

@@ -338,14 +338,14 @@ body.product-page {
.btn-add-to-wishlist { .btn-add-to-wishlist {
svg use { svg use {
stroke: #F47A7A; --icon-stroke: #F47A7A;
} }
} }
.btn-view-in-wishlist { .btn-view-in-wishlist {
svg use { svg use {
fill: #F47A7A; fill: #F47A7A;
stroke: none; --icon-stroke: none;
} }
} }
@@ -1022,7 +1022,7 @@ body.product-page {
.not-wished { .not-wished {
cursor: pointer; cursor: pointer;
stroke: #F47A7A !important; --icon-stroke: #F47A7A !important;
&:hover { &:hover {
fill: #F47A7A; fill: #F47A7A;
@@ -1030,7 +1030,7 @@ body.product-page {
} }
.wished { .wished {
stroke: none; --icon-stroke: none;
fill: #F47A7A !important; fill: #F47A7A !important;
} }

2
erpnext/templates/includes/navbar/navbar_items.html
View File

@@ -13,7 +13,7 @@
<li class="wishlist wishlist-icon hidden"> <li class="wishlist wishlist-icon hidden">
<a class="nav-link" href="/wishlist"> <a class="nav-link" href="/wishlist">
<svg class="icon icon-lg"> <svg class="icon icon-lg">
<use href="#icon-heart-active"></use> <use href="#icon-heart"></use>
</svg> </svg>
<span class="badge badge-primary shopping-badge" id="wish-count"></span> <span class="badge badge-primary shopping-badge" id="wish-count"></span>
</a> </a>

5
erpnext/www/shop-by-category/index.py
View File

@@ -62,8 +62,7 @@ def get_category_records(categories):
"parent_item_group": "All Item Groups", "parent_item_group": "All Item Groups",
"show_in_website": 1 "show_in_website": 1
}, },
fields=["name", "parent_item_group", "is_group", "image", "route"], fields=["name", "parent_item_group", "is_group", "image", "route"]
as_dict=True
) )
else: else:
doctype = frappe.unscrub(category) doctype = frappe.unscrub(category)
@@ -71,7 +70,7 @@ def get_category_records(categories):
if frappe.get_meta(doctype, cached=True).get_field("image"): if frappe.get_meta(doctype, cached=True).get_field("image"):
fields += ["image"] fields += ["image"]
categorical_data[category] = frappe.db.get_all(doctype, fields=fields, as_dict=True) categorical_data[category] = frappe.db.get_all(doctype, fields=fields)
return categorical_data return categorical_data