Skip to content

The Unified and Autonomous Development Platform

feat: Adjust height of various stats automatically based on widget height (OD-2281)

Robin Shen4500ec86c0b6
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.html b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.html
index 788c773961..6ffcc42952 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/LineChartPanel.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <div class="line-chart resize-aware"></div>
+ <div class="line-chart chart resize-aware"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js
index 181ee559d3..66e4d8c65c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/line/line-chart.js
@@ -131,7 +131,7 @@ onedev.server.lineChart = {
chart.setOption(option);
$chart.on("resized", function() {
- setTimeout(function(){
+ setTimeout(function() {
chart.resize();
});
});
diff --git a/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.html b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.html
index 7f77e230e7..c89d5dc9c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/chart/pie/PieChartPanel.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <div class="pie-chart resize-aware"></div>
+ <div class="pie-chart chart resize-aware"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.html b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.html
index 8e951ee566..e390dbc25f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/burndown/IterationBurndownPanel.html
@@ -1,7 +1,7 @@
<wicket:panel>
- <div wicket:id="content" class="burndown"></div>
+ <div wicket:id="content" class="burndown d-flex flex-column flex-grow-1"></div>
<wicket:fragment wicket:id="chartFrag">
- <div wicket:id="chart"></div>
+ <div wicket:id="chart" class="d-flex flex-column flex-grow-1"></div>
<wicket:enclosure child="message">
<div class="mt-4 text-muted font-size-sm"><wicket:svg href="bulb" class="icon"/> <span wicket:id="message"/></div>
</wicket:enclosure>
diff --git a/server-ee b/server-ee
index f04b51a400..6549abd985 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit f04b51a40069971eff5c025f6512c335d74a1850
+Subproject commit 6549abd9850f320b56c3b834b837485ceadda61d