nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 08:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflict

Browse Source
This commit is contained in:
ruthra kumar
2024-08-13 14:38:44 +05:30
parent 25096185c9
commit b0b5b25a53
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/selling/page/sales_funnel/sales_funnel.js
View File

@@ -248,11 +248,7 @@ erpnext.SalesFunnel = class SalesFunnel {
context.fill(); context.fill();
// draw text // draw text
<<<<<<< HEAD
context.fillStyle = "";
=======
context.fillStyle = getComputedStyle(document.body).getPropertyValue("--text-color"); context.fillStyle = getComputedStyle(document.body).getPropertyValue("--text-color");
>>>>>>> 61bc0925d5 (fix: text color in sales funnel report based on theme)
context.textBaseline = "middle"; context.textBaseline = "middle";
context.font = "1.1em sans-serif"; context.font = "1.1em sans-serif";
context.fillText(__(title), width + 20, y_mid); context.fillText(__(title), width + 20, y_mid);