From 78340853d8bce95a7c33db2690566e10fef5fcc3 Mon Sep 17 00:00:00 2001
From: prssanna <prssud@gmail.com>
Date: Mon, 4 Jan 2021 18:37:20 +0530
Subject: [PATCH] fix: progress bar background color

---
 frappe/public/js/frappe/list/list_view.js |  2 +-
 frappe/public/less/desk.less              | 21 --------------
 frappe/public/scss/desk/controls.scss     | 34 +++++++++++++++++++++++
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js
index 8483bf2ee0..bfb92fd973 100644
--- a/frappe/public/js/frappe/list/list_view.js
+++ b/frappe/public/js/frappe/list/list_view.js
@@ -692,7 +692,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
 			if (df.fieldtype === "Code") {
 				return value;
 			} else if (df.fieldtype === "Percent") {
-				return `<div class="progress level" style="margin: 0px;">
+				return `<div class="progress" style="margin: 0px;">
 						<div class="progress-bar progress-bar-success" role="progressbar"
 							aria-valuenow="${value}"
 							aria-valuemin="0" aria-valuemax="100" style="width: ${Math.round(value)}%;">
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index 9c76f30129..ed63ed208b 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -180,27 +180,6 @@ textarea.form-control {
 // 	min-height: 11.69in;
 // }
 
-.progress, .progress-bar {
-	box-shadow: none;
-}
-
-a.progress-small {
-	.progress-chart {
-		width: 40px;
-		margin-top: 4px;
-		float: right;
-	}
-
-	.progress {
-		margin-bottom: 0;
-	}
-
-	.progress-bar {
-		transition: unset;
-		background-color: #98d85b;
-	}
-}
-
 li.user-progress {
 	.progress-chart {
 		width: 50px;
diff --git a/frappe/public/scss/desk/controls.scss b/frappe/public/scss/desk/controls.scss
index 52c251b9d9..54ad71dce1 100644
--- a/frappe/public/scss/desk/controls.scss
+++ b/frappe/public/scss/desk/controls.scss
@@ -174,4 +174,38 @@
 		border-radius: var(--border-radius);
 		font-size: var(--text-md);
 	}
+}
+
+/* progress bar */
+.progress, .progress-bar {
+	box-shadow: none;
+}
+
+a.progress-small {
+	.progress-chart {
+		width: 40px;
+		margin-top: 4px;
+		float: right;
+	}
+
+	.progress {
+		margin-bottom: 0;
+	}
+
+	.progress-bar {
+		transition: unset;
+		background-color: var(--green-500);
+	}
+}
+
+.progress-bar-success {
+	background-color: var(--green-500);
+}
+
+.progress-bar-danger {
+	background-color: var(--red-500);
+}
+
+.progress-bar-warning {
+	background-color: var(--orange-500);
 }
\ No newline at end of file