From 3887f628ba8a59c3715c3806c4e90b613dfc362c Mon Sep 17 00:00:00 2001 From: Sarah Zakarias Date: Thu, 6 Feb 2025 11:36:42 +0000 Subject: [PATCH] Downloads chart - small adjustments --- app/lib/frontend/templates/views/pkg/score_tab.dart | 8 ++++---- .../lib/src/widget/downloads_chart/widget.dart | 11 +---------- pkg/web_css/lib/src/_pkg.scss | 2 +- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/app/lib/frontend/templates/views/pkg/score_tab.dart b/app/lib/frontend/templates/views/pkg/score_tab.dart index c061924308..d7bbd160bb 100644 --- a/app/lib/frontend/templates/views/pkg/score_tab.dart +++ b/app/lib/frontend/templates/views/pkg/score_tab.dart @@ -80,9 +80,6 @@ d.Node scoreTabNode({ ], ), _reportNode(report), - if (card.weeklyVersionDownloads != null && - requestContext.experimentalFlags.showDownloadCountsVersionChart) - _downloadsChart(card.weeklyVersionDownloads!), if (toolEnvInfo != null) toolEnvInfo, ]), if (!showPending) @@ -98,6 +95,9 @@ d.Node scoreTabNode({ d.text(' for details.'), ], ), + if (card.weeklyVersionDownloads != null && + requestContext.experimentalFlags.showDownloadCountsVersionChart) + _downloadsChart(card.weeklyVersionDownloads!), ]); } @@ -207,7 +207,7 @@ d.Node _downloadsChart(WeeklyVersionDownloadCounts weeklyVersionDownloads) { ); return d.fragment([ - d.h1(text: 'Weekly Downloads over the last 40 weeks'), + d.h1(text: 'Weekly downloads'), versionModes, container, ]); diff --git a/pkg/web_app/lib/src/widget/downloads_chart/widget.dart b/pkg/web_app/lib/src/widget/downloads_chart/widget.dart index 7d1191aa72..b5b4c4bf1b 100644 --- a/pkg/web_app/lib/src/widget/downloads_chart/widget.dart +++ b/pkg/web_app/lib/src/widget/downloads_chart/widget.dart @@ -211,7 +211,7 @@ void drawChart( } final longTick = SVGPathElement(); - longTick.setAttribute('class', 'downloads-chart-frame'); + longTick.setAttribute('class', 'downloads-chart-axis-line'); longTick.setAttribute('d', 'M$xAxisStart $y L$xAxisEnd $y'); chart.append(longTick); } @@ -291,13 +291,4 @@ void drawChart( legendLabel.getBBox().width + labelPadding; } - - final frameHeight = legendY + marginPadding + labelPadding; - final frame = SVGRectElement() - ..setAttribute('class', 'downloads-chart-frame') - ..setAttribute('height', '$frameHeight') - ..setAttribute('width', '$frameWidth') - ..setAttribute('rx', '15') - ..setAttribute('ry', '15'); - chart.append(frame); } diff --git a/pkg/web_css/lib/src/_pkg.scss b/pkg/web_css/lib/src/_pkg.scss index a92798a28f..7006582d26 100644 --- a/pkg/web_css/lib/src/_pkg.scss +++ b/pkg/web_css/lib/src/_pkg.scss @@ -297,7 +297,7 @@ margin-left: 10px; } - .downloads-chart-frame { + .downloads-chart-axis-line { fill:none; stroke-width: 1; stroke: var(--pub-downloads-chart-frame-color);