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

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
commit 856d3f63b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions

View File

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

View File

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

View File

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