vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: Resolved conflict

Browse source
This commit is contained in:
Shariq Ansari 2021-10-05 17:26:52 +05:30
parent dca6dd2750
commit dc9f6a58c8
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/list/list_settings.js
View file

@ -114,7 +114,7 @@ export default class ListSettings {
<div class="row">
<div class="col-md-1">
${frappe.utils.icon("drag", "xs", "", "sortable-handle " + show_sortable_handle)}
${frappe.utils.icon("drag", "xs", "", "", "sortable-handle " + show_sortable_handle)}
</div>
<div class="col-md-10" style="padding-left:0px;">
${me.fields[idx].label}

2
frappe/public/js/frappe/utils/utils.js
View file

@ -1123,7 +1123,7 @@ Object.assign(frappe.utils, {
}
},
icon(icon_name, size="sm", icon_class="", svg_class="") {
icon(icon_name, size="sm", icon_class="", icon_style="", svg_class="") {
let size_class = "";
let icon_style = "";
if (typeof size == "object") {