From d9e0052003af71d40bb973f29cb067a39a5cd240 Mon Sep 17 00:00:00 2001 From: Allan Eising Date: Sun, 15 Jun 2025 10:07:46 +0200 Subject: [PATCH 1/9] Begin redesign --- .../frontend/templates/base/base.html.j2 | 50 ++++++++++++ .../frontend/templates/base/page.html.j2 | 41 ++++++++++ .../templates/base/partials/navbar.html.j2 | 77 +++++++++++++++++++ .../templates/base/partials/scripts.html.j2 | 26 +++++++ .../templates/base/partials/sidebar.html.j2 | 43 +++++++++++ .../base/partials/stylesheets.html.j2 | 37 +++++++++ .../templates/clients/redesign.html.j2 | 27 +++++++ .../frontend/templates/dashboard.html | 2 +- .../frontend/templates/dashboard/_base.html | 2 +- .../sshecret_admin/frontend/views/clients.py | 31 ++++++++ .../src/sshecret_admin/static/css/main.css | 10 +++ 11 files changed, 344 insertions(+), 2 deletions(-) create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2 create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/scripts.html.j2 create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/stylesheets.html.j2 create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/redesign.html.j2 diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 new file mode 100644 index 0000000..91e82c1 --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 @@ -0,0 +1,50 @@ + + + + + + {% block title %}Sshecret Admin{% endblock %} + + {% block head %} + {% include 'base/partials/stylesheets.html.j2' %} + {% endblock %} + + + + + + + + +
+ + + + + +
+ + +
+ {% include "base/partials/navbar.html.j2" %} +
+ + +
+ {% block breadcrumbs %} + {% endblock %} +
+ {% block content %}{% endblock %} +
+
+ +
+
+ + {% block scripts %} + {% include 'base/partials/scripts.html.j2' %} + {% endblock %} + + diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 new file mode 100644 index 0000000..6ca2ac1 --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 @@ -0,0 +1,41 @@ +{% extends "/base/base.html.j2" %} + +{% block title %}{{ title or "Page" }}{% endblock %} + +{% block breadcrumbs %} + +
+ +
+{% endblock %} +{% block content %} + + + + +
+ {% block page_content %} +

This is a generic page.

+ {% endblock %} +
+ +{% endblock %} diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2 new file mode 100644 index 0000000..2ca5952 --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/navbar.html.j2 @@ -0,0 +1,77 @@ +
+ + +
+ + + + + + + Sshecret Logo + Sshecret + + +
+ + +
+ + + + +
+
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/scripts.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/scripts.html.j2 new file mode 100644 index 0000000..db5ecc9 --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/scripts.html.j2 @@ -0,0 +1,26 @@ +{# #} + + + + + + + + diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 new file mode 100644 index 0000000..e58cff5 --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 @@ -0,0 +1,43 @@ + + + +
+ + + 🐚 Sshecret + +
+ + diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/stylesheets.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/stylesheets.html.j2 new file mode 100644 index 0000000..7164315 --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/stylesheets.html.j2 @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/redesign.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/redesign.html.j2 new file mode 100644 index 0000000..a34f100 --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/redesign.html.j2 @@ -0,0 +1,27 @@ +{% extends 'base/page.html.j2' %} + + +{% block title %}Clients{% endblock %} + +{% block page_content %} + + +
+ + +
+ {% block master %} +

Master list goes here

+ {% endblock %} +
+ + +
+ {% block detail %} +

Select an item from the list to view details.

+ {% endblock %} +
+ +
+ +{% endblock %} diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard.html b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard.html index 800e0c5..840257b 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard.html +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard.html @@ -1,4 +1,4 @@ -{% extends "/dashboard/_base.html" %} {% block content %} +{% extends "/base/base.html.j2" %} {% block content %}
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard/_base.html b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard/_base.html index 2dddefa..1eb7f2e 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard/_base.html +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/dashboard/_base.html @@ -13,7 +13,7 @@ {% endif %}
-
+
{% block content %} {% endblock %}
diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py b/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py index c8c8c8f..ea61bf6 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py @@ -107,6 +107,37 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter: }, ) + @app.get("/clients/new/") + async def get_new_client_tree( + request: Request, + current_user: Annotated[LocalUserInfo, Depends(dependencies.get_user_info)], + admin: Annotated[AdminBackend, Depends(dependencies.get_admin_backend)], + ) -> Response: + """Get client tree view.""" + page = 1 + per_page = CLIENTS_PER_PAGE + offset = 0 + + client_filter = ClientFilter(offset=offset, limit=per_page) + results = await admin.query_clients(client_filter) + paginate = PagingInfo( + page=page, limit=per_page, total=results.total_results, offset=offset + ) + + LOG.info("Results %r", results) + return templates.TemplateResponse( + request, + "clients/redesign.html.j2", + { + "page_title": "Clients", + "offset": offset, + "pages": paginate, + "clients": results.clients, + "user": current_user, + "results": results, + }, + ) + @app.get("/clients/page/{page}") async def get_client_page( request: Request, diff --git a/packages/sshecret-admin/src/sshecret_admin/static/css/main.css b/packages/sshecret-admin/src/sshecret_admin/static/css/main.css index 3317fc3..afaae79 100644 --- a/packages/sshecret-admin/src/sshecret_admin/static/css/main.css +++ b/packages/sshecret-admin/src/sshecret_admin/static/css/main.css @@ -2854,6 +2854,11 @@ height: 100vh; } } + .md\:w-64 { + @media (width >= 48rem) { + width: calc(var(--spacing) * 64); + } + } .md\:w-\[calc\(100\%-256px\)\] { @media (width >= 48rem) { width: calc(100% - 256px); @@ -2879,6 +2884,11 @@ grid-template-columns: repeat(2, minmax(0, 1fr)); } } + .md\:grid-cols-\[300px_1fr\] { + @media (width >= 48rem) { + grid-template-columns: 300px 1fr; + } + } .md\:flex-row { @media (width >= 48rem) { flex-direction: row; -- 2.34.1 From 9b0588679fba6dbe72e7f0b998a207f025890f2c Mon Sep 17 00:00:00 2001 From: Allan Eising Date: Wed, 18 Jun 2025 08:34:45 +0200 Subject: [PATCH 2/9] fix tabs and tables --- .../templates/clients/partials/client_details.html.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/client_details.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/client_details.html.j2 index f2b4f90..09b7dbb 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/client_details.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/client_details.html.j2 @@ -38,7 +38,7 @@
- + Client Data Events @@ -86,7 +86,7 @@ - +
-- 2.34.1 From 05775a2e1ea7211903d0618b2a132a4e89cdffa2 Mon Sep 17 00:00:00 2001 From: Allan Eising Date: Wed, 18 Jun 2025 08:54:04 +0200 Subject: [PATCH 3/9] Complete inital re-design of client page --- .../frontend/templates/base/base.html.j2 | 6 +- .../base/master-detail-email.html.j2 | 26 ++++ .../master-detail.html.j2} | 0 .../templates/base/partials/sidebar.html.j2 | 4 +- .../frontend/templates/clients/client.html.j2 | 66 ++++------ .../frontend/templates/clients/index.html.j2 | 47 +++---- .../templates/clients/partials/tree.html.j2 | 116 +++++++++--------- .../templates/clients/partials/tree_event.js | 17 ++- .../clients/partials/tree_items.html.j2 | 1 - .../sshecret_admin/frontend/views/clients.py | 40 ++---- .../src/sshecret_admin/static/css/main.css | 68 ++++------ 11 files changed, 171 insertions(+), 220 deletions(-) create mode 100644 packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/master-detail-email.html.j2 rename packages/sshecret-admin/src/sshecret_admin/frontend/templates/{clients/redesign.html.j2 => base/master-detail.html.j2} (100%) diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 index 91e82c1..33890e8 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/base.html.j2 @@ -35,7 +35,7 @@
{% block breadcrumbs %} {% endblock %} -
+
{% block content %}{% endblock %}
@@ -43,8 +43,12 @@ + {% block scripts %} {% include 'base/partials/scripts.html.j2' %} {% endblock %} + {% block local_scripts %} + {% endblock %} + diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/master-detail-email.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/master-detail-email.html.j2 new file mode 100644 index 0000000..19c21da --- /dev/null +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/master-detail-email.html.j2 @@ -0,0 +1,26 @@ +{% extends 'base/page.html.j2' %} + +{% block page_content %} + + +
+ + + + + + + +
+ +{% endblock %} diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/redesign.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/master-detail.html.j2 similarity index 100% rename from packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/redesign.html.j2 rename to packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/master-detail.html.j2 diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 index e58cff5..d34a839 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/partials/sidebar.html.j2 @@ -26,14 +26,14 @@
  • - + Secrets
  • - + Audit Log diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/client.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/client.html.j2 index 945547b..051235c 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/client.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/client.html.j2 @@ -1,46 +1,24 @@ -{% extends "/dashboard/_base.html" %} {% block content %} -
    -
    -
    - - - -
    - -
    -
    - {% include '/clients/partials/tree.html.j2' %} -
    -
    -
    - {% include '/clients/partials/client_details.html.j2' %} -
    -
    -
    -
    - -
    -{% include '/clients/partials/drawer_create.html.j2' %} +{% extends 'base/master-detail-email.html.j2' %} +{% block title %}Client {{ client.name }}{% endblock %} +{% block master %} + {% include '/clients/partials/tree.html.j2' %} {% endblock %} + + +{% block detail %} + +
    + {% include '/clients/partials/client_details.html.j2' %} +
    +{% endblock %} + +{% include '/clients/partials/drawer_create.html.j2' %} +{% block local_scripts %} + +{% endblock local_scripts %} + + + diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/index.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/index.html.j2 index 6087d1d..1342079 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/index.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/index.html.j2 @@ -1,41 +1,22 @@ -{% extends "/dashboard/_base.html" %} {% block content %} -
    -
    -
    - +{% block master %} + {% include '/clients/partials/tree.html.j2' %} +{% endblock %} -
    +{% block detail %} -
    -
    - {% include '/clients/partials/tree.html.j2' %} -
    -
    -
    -

    Click an item to view details

    -
    -
    -
    +
    +

    Click an item to view details

    +{% endblock %} -
    {% include '/clients/partials/drawer_create.html.j2' %} -{% endblock %} +{% block local_scripts %} + +{% endblock local_scripts %} diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 index 05a82a8..5f97a2f 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 @@ -1,67 +1,65 @@ -
    -
    -
    -

    Clients

    -
    -
    -
    - - Loading... +{# This is the master block #} + +
    +
    +

    Clients

    + +
    +
    +
    + + Loading... +
    +
    +
    + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    -
    - -
    -
    -
    -
    - -
    -
    - -
    - -
    -
    -
    -
    - {% include '/clients/partials/tree_items.html.j2' %} -
    +
    + {% include '/clients/partials/tree_items.html.j2' %}
    - diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_event.js b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_event.js index 1e260c9..ce1f655 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_event.js +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_event.js @@ -8,6 +8,8 @@ function addTreeListener() { if (!selectedEl) return; + const masterPane = document.getElementById("master-pane"); + const detailPane = document.getElementById("detail-pane"); const type = selectedEl.dataset.nodeType; const clientId = selectedEl.dataset.clientId; const name = selectedEl.dataset.clientName; @@ -17,11 +19,16 @@ function addTreeListener() { let url = `/clients/client/${encodeURIComponent(clientId)}`; if (url) { - htmx.ajax("GET", url, { - target: "#clientdetails", - //swap: 'OuterHTML', - indicator: "#client-spinner", - }); + htmx + .ajax("GET", url, { + target: "#clientdetails", + //swap: 'OuterHTML', + indicator: "#client-spinner", + }) + .then(() => { + masterPane.classList.add("hidden"); + detailPane.classList.remove("hidden"); + }); } }); } diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_items.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_items.html.j2 index bbec2ed..2df44aa 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_items.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree_items.html.j2 @@ -38,5 +38,4 @@ {% include 'clients/partials/pagination.html.j2' %}
    {% endif %} -
    diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py b/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py index ea61bf6..fa476c4 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/views/clients.py @@ -93,42 +93,14 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter: page=page, limit=per_page, total=results.total_results, offset=offset ) + breadcrumbs = [("clients", "/clients/")] + LOG.info("Results %r", results) return templates.TemplateResponse( request, "clients/index.html.j2", { - "page_title": "Clients", - "offset": offset, - "pages": paginate, - "clients": results.clients, - "user": current_user, - "results": results, - }, - ) - - @app.get("/clients/new/") - async def get_new_client_tree( - request: Request, - current_user: Annotated[LocalUserInfo, Depends(dependencies.get_user_info)], - admin: Annotated[AdminBackend, Depends(dependencies.get_admin_backend)], - ) -> Response: - """Get client tree view.""" - page = 1 - per_page = CLIENTS_PER_PAGE - offset = 0 - - client_filter = ClientFilter(offset=offset, limit=per_page) - results = await admin.query_clients(client_filter) - paginate = PagingInfo( - page=page, limit=per_page, total=results.total_results, offset=offset - ) - - LOG.info("Results %r", results) - return templates.TemplateResponse( - request, - "clients/redesign.html.j2", - { + "breadcrumbs": breadcrumbs, "page_title": "Clients", "offset": offset, "pages": paginate, @@ -197,6 +169,11 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter: ) template = "clients/client.html.j2" + breadcrumbs = [ + ("clients", "/clients/"), + (results.client.name, request.url.path), + ] + headers: dict[str, str] = {} if request.headers.get("HX-Request"): headers["HX-Push-Url"] = request.url.path @@ -207,6 +184,7 @@ def create_router(dependencies: FrontendDependencies) -> APIRouter: template, { "page_title": f"Client {results.client.name}", + "breadcrumbs": breadcrumbs, "pages": results.pages, "clients": results.results.clients, "client": results.client, diff --git a/packages/sshecret-admin/src/sshecret_admin/static/css/main.css b/packages/sshecret-admin/src/sshecret_admin/static/css/main.css index afaae79..0fd78ac 100644 --- a/packages/sshecret-admin/src/sshecret_admin/static/css/main.css +++ b/packages/sshecret-admin/src/sshecret_admin/static/css/main.css @@ -382,9 +382,6 @@ .order-1 { order: 1; } - .order-2 { - order: 2; - } .col-span-2 { grid-column: span 2 / span 2; } @@ -457,9 +454,6 @@ .ms-3 { margin-inline-start: calc(var(--spacing) * 3); } - .ms-auto { - margin-inline-start: auto; - } .me-2 { margin-inline-end: calc(var(--spacing) * 2); } @@ -682,15 +676,18 @@ .h-\[12px\] { height: 12px; } - .h-\[16px\] { - height: 16px; - } - .h-\[32px\] { - height: 32px; - } .h-\[36rem\] { height: 36rem; } + .h-\[calc\(100vh-4rem\)\] { + height: calc(100vh - 4rem); + } + .h-\[calc\(100vh-8rem\)\] { + height: calc(100vh - 8rem); + } + .h-\[calc\(100vh-10rem\)\] { + height: calc(100vh - 10rem); + } .h-full { height: 100%; } @@ -1245,9 +1242,6 @@ .border-blue-300 { border-color: var(--color-blue-300); } - .border-blue-700 { - border-color: var(--color-blue-700); - } .border-gray-100 { border-color: var(--color-gray-100); } @@ -1332,9 +1326,6 @@ .bg-blue-600 { background-color: var(--color-blue-600); } - .bg-blue-700 { - background-color: var(--color-blue-700); - } .bg-emerald-500 { background-color: var(--color-emerald-500); } @@ -2175,13 +2166,6 @@ } } } - .hover\:bg-blue-800 { - &:hover { - @media (hover: hover) { - background-color: var(--color-blue-800); - } - } - } .hover\:bg-gray-50 { &:hover { @media (hover: hover) { @@ -2774,11 +2758,6 @@ inset: calc(var(--spacing) * 0); } } - .md\:order-1 { - @media (width >= 48rem) { - order: 1; - } - } .md\:order-2 { @media (width >= 48rem) { order: 2; @@ -2859,6 +2838,16 @@ width: calc(var(--spacing) * 64); } } + .md\:w-72 { + @media (width >= 48rem) { + width: calc(var(--spacing) * 72); + } + } + .md\:w-80 { + @media (width >= 48rem) { + width: calc(var(--spacing) * 80); + } + } .md\:w-\[calc\(100\%-256px\)\] { @media (width >= 48rem) { width: calc(100% - 256px); @@ -3114,6 +3103,11 @@ width: auto; } } + .lg\:table-fixed { + @media (width >= 64rem) { + table-layout: fixed; + } + } .lg\:grid-cols-2 { @media (width >= 64rem) { grid-template-columns: repeat(2, minmax(0, 1fr)); @@ -3469,11 +3463,6 @@ border-color: var(--color-red-800); } } - .dark\:bg-blue-600 { - &:where(.dark, .dark *) { - background-color: var(--color-blue-600); - } - } .dark\:bg-blue-900 { &:where(.dark, .dark *) { background-color: var(--color-blue-900); @@ -3728,15 +3717,6 @@ } } } - .dark\:hover\:bg-blue-700 { - &:where(.dark, .dark *) { - &:hover { - @media (hover: hover) { - background-color: var(--color-blue-700); - } - } - } - } .dark\:hover\:bg-blue-800 { &:where(.dark, .dark *) { &:hover { -- 2.34.1 From d55c69954943d098906c746a027330a978012c1b Mon Sep 17 00:00:00 2001 From: Allan Eising Date: Wed, 18 Jun 2025 19:15:12 +0200 Subject: [PATCH 4/9] Set breadcrumb dynamically --- .../frontend/templates/base/page.html.j2 | 2 +- .../templates/clients/partials/tree_event.js | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 index 6ca2ac1..fd54b7d 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/base/page.html.j2 @@ -7,7 +7,7 @@
    • Timestamp
    diff --git a/packages/sshecret-admin/src/sshecret_admin/static/css/style.css b/packages/sshecret-admin/src/sshecret_admin/static/css/style.css index fb98eea..5fe2654 100644 --- a/packages/sshecret-admin/src/sshecret_admin/static/css/style.css +++ b/packages/sshecret-admin/src/sshecret_admin/static/css/style.css @@ -19,3 +19,11 @@ sl-details.small-details::part(header) { sl-details.small-details::part(base) { font-size: var(--sl-input-font-size-small); } + +@media (prefers-color-scheme: dark) { + sl-details::part(base) { + background-color: var(--color-gray-700); + border: solid 1px var(--color-gray-500); + color: var(--color-gray-50); + } +} -- 2.34.1 From 2b50c686d07a0d49b00a7a25e43ae53f96b762f1 Mon Sep 17 00:00:00 2001 From: Allan Eising Date: Thu, 19 Jun 2025 07:23:26 +0200 Subject: [PATCH 9/9] Add heading back --- .../frontend/templates/clients/partials/tree.html.j2 | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 index c983c43..39b3be6 100644 --- a/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 +++ b/packages/sshecret-admin/src/sshecret_admin/frontend/templates/clients/partials/tree.html.j2 @@ -2,6 +2,7 @@
    +

    Client List