Skip to content

High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.

Apply minor style improvement to card layout on the import status page.

Kailash Nadhadef2fe92f7f
diff --git a/static/admin/assets/css/style.css b/static/admin/assets/css/style.css
index ced33a8a..d7344126 100644
--- a/static/admin/assets/css/style.css
+++ b/static/admin/assets/css/style.css
@@ -1521,10 +1521,6 @@ section.import {
max-width: 100px;
}
- .status {
- padding: var(--space-12);
- }
-
.log-view .lines {
max-height: 240px;
text-align: start;
diff --git a/static/admin/views/import.html b/static/admin/views/import.html
index 8bfa3890..312798b8 100644
--- a/static/admin/views/import.html
+++ b/static/admin/views/import.html
@@ -15,7 +15,7 @@
<h1 class="page-title">{{ .L.T "import.title" }}</h1>
</header>
- <div class="page-content{{ if not $show }} card{{ end }}">
+ <div class="page-content">
<!-- Upload form. -->
{{ if $show }}
<form @submit.prevent="onUpload">
@@ -105,7 +105,8 @@
<!-- Running / done status. -->
{{ if not $show }}
<section class="status">
- <article class="card stat-card">
+ <article class="card float">
+ <h5 class="title capitalize" :class="{ 'text-danger': status.status === 'failed' || status.status === 'stopped' }" x-text="status.status">{{ $d.Status.Status }}</h5>
<div class="row">
<header class="col-8">
<small class="text-light hstack">
@@ -113,7 +114,6 @@
<span class="badge" :data-variant="statusVariant" x-text="progress + '%'"></span>
<span x-show="isRunning" aria-busy="true" data-spinner="small"></span>
</small>
- <div class="stat-value capitalize" :class="{ 'text-danger': status.status === 'failed' || status.status === 'stopped' }" x-text="status.status">{{ $d.Status.Status }}</div>
</header>
<div class="col-4 hstack justify-end items-center">
<button type="button" data-variant="danger" data-testid="btn-stop" x-show="!isDone" @click="stopImport" :disabled="isProcessing || status.status === 'stopping'" :aria-busy="isProcessing">{{ .L.T "import.stopImport" }}</button>
@@ -126,7 +126,8 @@
</footer>
</article>
- <div class="import-logs log-view mt-6">
+ <article class="card float import-logs log-view mt-6">
+ <h5 class="title">{{ .L.T "menu.logs" }}</h5>
<div class="lines" x-ref="logLines">
<template x-for="(l, i) in logLines" :key="i">
<span class="line">
@@ -136,7 +137,7 @@
</span>
</template>
</div>
- </div>
+ </article>
</section>
{{ end }}
diff --git a/tests/specs/import.spec.js b/tests/specs/import.spec.js
index 7c826cf6..d60cb6ca 100644
--- a/tests/specs/import.spec.js
+++ b/tests/specs/import.spec.js
@@ -75,7 +75,7 @@ test.describe('Import', () => {
await page.locator('input[type=file]').setInputFiles(CSV);
await page.getByTestId('btn-upload').click();
- await expect(page.locator('.stat-value')).toContainText('failed');
+ await expect(page.locator('.status .title').first()).toContainText('failed');
});
});
});