diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index cf8ae80982..63b2e6e556 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -93,4 +93,19 @@ // --appreciation-bg: var(--dark-green-600); // --criticism-color: var(--red-100); // --criticism-bg: var(--red-600); + + // Frappe Charts Colors + --charts-label-color: var(--gray-300); + --charts-axis-line-color: var(--gray-500); + + --charts-stroke-width: 5px; + --charts-dataset-circle-stroke: #ffffff; + --charts-dataset-circle-stroke-width: var(--charts-stroke-width); + + --charts-tooltip-title: var(--charts-label-color); + --charts-tooltip-label: var(--charts-label-color); + --charts-tooltip-value: white; + --charts-tooltip-bg: var(--gray-900); + + --charts-legend-label: var(--charts-label-color); } diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index 55d06809bd..d39819971c 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -433,12 +433,4 @@ kbd { margin-right: var(--margin-sm); } } -} - -.chart-container { - .frappe-chart { - line.line-horizontal, line.line-vertical { - stroke: var(--border-color) !important; - } - } } \ No newline at end of file diff --git a/package.json b/package.json index da84131c29..60b3385579 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "driver.js": "^0.9.8", "express": "^4.17.1", "fast-deep-equal": "^2.0.1", - "frappe-charts": "^1.5.1", + "frappe-charts": "^2.0.0-rc2", "frappe-datatable": "^1.15.3", "frappe-gantt": "^0.5.0", "fuse.js": "^3.4.6", diff --git a/yarn.lock b/yarn.lock index ed7a30f0ec..715de222b0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2484,10 +2484,10 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" -frappe-charts@^1.5.1: - version "1.5.4" - resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-1.5.4.tgz#5870f77ac6ffc8ea4dab32adda1d4e5e4fbda64b" - integrity sha512-hBr7cRLmsCC5VBj/HwKOCgdwyXnkeAO5CAvOd5H4IYFbk84VD9jOjx9fSaqAE0MygVVbY1nCN+5nb08WThW4Xw== +frappe-charts@^2.0.0-rc2: + version "2.0.0-rc2" + resolved "https://registry.yarnpkg.com/frappe-charts/-/frappe-charts-2.0.0-rc2.tgz#2908970a88c61a248f9898c0a39702c264356221" + integrity sha512-kVFasajlqXiyekyuDLGUk75y1ZT8jyFS4PanyRDoCSAwpfn3F+vnYXiiQWgXx3dIH2skE7sqtDCbqdhEixn/UQ== frappe-datatable@^1.15.3: version "1.15.3"