Correct merge issues

This commit is contained in:
Jip Fr 2021-04-23 18:48:52 +02:00
parent 06385b6d2a
commit 36ec97501b
3 changed files with 9 additions and 6 deletions

View File

@ -22,6 +22,8 @@ document.querySelectorAll('.feature-list-wrapper').forEach(progressListElement =
enabled: false
};
const isInBrightCard = !!progressListElement.closest('.right.sect');
new Chart(progressListElement.querySelector('canvas'), {
type: 'doughnut',
data: {
@ -29,7 +31,7 @@ document.querySelectorAll('.feature-list-wrapper').forEach(progressListElement =
datasets: [
{
data,
backgroundColor: ['#9D6FF3', '#4C5174']
backgroundColor: isInBrightCard ? ['white', 'rgba(195, 178, 227, 0.5)'] : ['#9D6FF3', '#4C5174']
}
]
},

View File

@ -35,6 +35,10 @@
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;700&display=swap" rel="stylesheet">
</head>
<body>
{{{ body }}}
<div class="main-body">
{{{ body }}}
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.0.2/chart.min.js"></script>
<script src="/assets/js/progress-charts.js"></script>
</body>
</html>

View File

@ -20,7 +20,4 @@
{{> footer }}
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.0.2/chart.min.js"></script>
<script src="/assets/js/progress-charts.js"></script>
</div>