From db1d2d75d67b4fc62148c6b0ab95ae33fe2ffd59 Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Mon, 10 Mar 2025 23:53:43 +0800 Subject: [PATCH] css, html: Fix for multi-row headers and footers --- static/style.css | 32 +++++++++++++++++++------------- templates/group.tmpl | 2 +- templates/login.tmpl | 2 +- diff --git a/static/style.css b/static/style.css index 85b0e5a86f73371e4b35b81a45beeb0482dc83ff..1c948365f930ac48890dd9333bd566fdf391e7fe 100644 --- a/static/style.css +++ b/static/style.css @@ -76,7 +76,7 @@ .toggle-table-on:checked + table > tbody { display: table-row-group; } -table.rounded { +table.rounded, table.rounded-footed { overflow: hidden; border-spacing: 0; border-collapse: separate; @@ -84,28 +84,34 @@ border-radius: var(--radius-1); border: var(--lighter-border-color) solid 1px; } -table.rounded th, table.rounded td { +table.rounded th, table.rounded td, +table.rounded-footed th, table.rounded-footed td { border: none; } table.rounded th:not(:last-child), -table.rounded td:not(:last-child) { +table.rounded td:not(:last-child), +table.rounded-footed th:not(:last-child), +table.rounded-footed td:not(:last-child) { border-right: var(--lighter-border-color) solid 1px; } -table.rounded>thead>tr:not(:last-child)>th, -table.rounded>thead>tr:not(:last-child)>td, +table.rounded>thead>tr>th, +table.rounded>thead>tr>td, table.rounded>tbody>tr:not(:last-child)>th, -table.rounded>tbody>tr:not(:last-child)>td, -table.rounded>tfoot>tr:not(:last-child)>th, -table.rounded>tfoot>tr:not(:last-child)>td, -table.rounded>tr:not(:last-child)>td, -table.rounded>tr:not(:last-child)>th, -table.rounded>thead:not(:last-child), -table.rounded>tbody:not(:last-child), -table.rounded>tfoot:not(:last-child) { +table.rounded>tbody>tr:not(:last-child)>td { border-bottom: var(--lighter-border-color) solid 1px; } + +table.rounded-footed>thead>tr>th, +table.rounded-footed>thead>tr>td, +table.rounded-footed>tbody>tr>th, +table.rounded-footed>tbody>tr>td, +table.rounded-footed>tfoot>tr:not(:last-child)>th, +table.rounded-footed>tfoot>tr:not(:last-child)>td { + border-bottom: var(--lighter-border-color) solid 1px; +} + /* Footer styles */ footer { diff --git a/templates/group.tmpl b/templates/group.tmpl index 9c8c9eb161b5eeea9a72dd99be4a82cbb256b011..98d4c765f5c8743c830e271ee6c99b6843a12b90 100644 --- a/templates/group.tmpl +++ b/templates/group.tmpl @@ -22,7 +22,7 @@ {{- if .direct_access -}}
- +
diff --git a/templates/login.tmpl b/templates/login.tmpl index c5409af3376b6626546626924c9b86c9acf65c91..3bac03053bb6396542689409f2393239077ce880 100644 --- a/templates/login.tmpl +++ b/templates/login.tmpl @@ -13,7 +13,7 @@ {{- .login_error -}}
- +
-- 2.48.1