diff --git a/qt/aqt/stats.py b/qt/aqt/stats.py index d1bdb93e5..747054d21 100644 --- a/qt/aqt/stats.py +++ b/qt/aqt/stats.py @@ -9,6 +9,7 @@ import time import aqt from anki.lang import _ from aqt.qt import * +from aqt.theme import theme_manager from aqt.utils import ( addCloseShortcut, getSaveFile, @@ -87,4 +88,8 @@ class DeckStats(QDialog): def refresh(self): self.form.web.set_open_links_externally(False) - self.form.web.load(QUrl(f"{self.mw.serverURL()}_anki/graphs.html")) + if theme_manager.night_mode: + extra = "#night" + else: + extra = "" + self.form.web.load(QUrl(f"{self.mw.serverURL()}_anki/graphs.html"+extra)) diff --git a/ts/css.d.ts b/ts/css.d.ts index cbe652dbe..0292a33a0 100644 --- a/ts/css.d.ts +++ b/ts/css.d.ts @@ -1 +1 @@ -declare module "*.css"; +declare module "*.scss"; diff --git a/ts/package.json b/ts/package.json index 91ed8c38f..4f73e7715 100644 --- a/ts/package.json +++ b/ts/package.json @@ -31,6 +31,7 @@ "prettier": "^2.0.0", "prettier-plugin-svelte": "^1.1.0", "sass": "^1.26.9", + "sass-loader": "^8.0.2", "style-loader": "^1.2.1", "svelte": "^3.23.2", "svelte-loader": "^2.13.6", diff --git a/ts/src/html/graphs.html b/ts/src/html/graphs.html index 9ed95ba15..d06ae769c 100644 --- a/ts/src/html/graphs.html +++ b/ts/src/html/graphs.html @@ -8,6 +8,10 @@
diff --git a/ts/src/stats/CalendarGraph.svelte b/ts/src/stats/CalendarGraph.svelte index b75e01822..41f2f6f29 100644 --- a/ts/src/stats/CalendarGraph.svelte +++ b/ts/src/stats/CalendarGraph.svelte @@ -11,6 +11,7 @@ export let sourceData: pb.BackendProto.GraphsOut | null = null; export let revlogRange: RevlogRange = RevlogRange.Month; export let i18n: I18n; + export let nightMode: boolean; let graphData: GraphData | null = null; @@ -42,7 +43,14 @@ } $: if (graphData) { - renderCalendar(svg as SVGElement, bounds, graphData, targetYear, i18n); + renderCalendar( + svg as SVGElement, + bounds, + graphData, + targetYear, + i18n, + nightMode + ); } const title = i18n.tr(i18n.TR.STATISTICS_REVIEWS_TITLE); diff --git a/ts/src/stats/GraphsPage.svelte b/ts/src/stats/GraphsPage.svelte index f8a42f4b5..4aba44c70 100644 --- a/ts/src/stats/GraphsPage.svelte +++ b/ts/src/stats/GraphsPage.svelte @@ -1,5 +1,5 @@