From fe2222d57cc527b57ca776287343e2a2f8d1853a Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Wed, 4 Sep 2024 15:09:48 +0200 Subject: [PATCH 01/19] Add logo file --- src/howitz/templates/includes/zino-logo.svg | 90 ++++++++++++++++++--- 1 file changed, 80 insertions(+), 10 deletions(-) diff --git a/src/howitz/templates/includes/zino-logo.svg b/src/howitz/templates/includes/zino-logo.svg index 02888069..b9add467 100644 --- a/src/howitz/templates/includes/zino-logo.svg +++ b/src/howitz/templates/includes/zino-logo.svg @@ -1,10 +1,80 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From e3ca4e99fb86102b6bcd1f3d6aad85e6ca6e17cc Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Wed, 4 Sep 2024 15:20:20 +0200 Subject: [PATCH 02/19] Add flexible height in logo svg --- src/howitz/templates/includes/zino-logo.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/howitz/templates/includes/zino-logo.svg b/src/howitz/templates/includes/zino-logo.svg index b9add467..515f48e0 100644 --- a/src/howitz/templates/includes/zino-logo.svg +++ b/src/howitz/templates/includes/zino-logo.svg @@ -1,5 +1,5 @@ - +

Login page

-
+
- {% include "/includes/zino-logo.svg"%} + {% with height='40' %} + {% include "/includes/zino-logo.svg" %} + {% endwith %} -

Sign in to Zino

+

Sign in to Zino

From 0dfd54b5dc94f87fdae76f08b4f0ff4f5e70bc39 Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Wed, 4 Sep 2024 15:36:16 +0200 Subject: [PATCH 04/19] Add logo to navbar --- src/howitz/templates/components/navbar/navbar.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/howitz/templates/components/navbar/navbar.html b/src/howitz/templates/components/navbar/navbar.html index 456f56e5..71fcbecd 100644 --- a/src/howitz/templates/components/navbar/navbar.html +++ b/src/howitz/templates/components/navbar/navbar.html @@ -3,9 +3,11 @@ - {% include "/includes/zino-logo.svg" %} + {% with height='16' %} + {% include "/includes/zino-logo.svg" %} + {% endwith %}
From 8b838df159c36066b1b959a1e68454fdf80d6fe9 Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Wed, 4 Sep 2024 15:47:56 +0200 Subject: [PATCH 05/19] Add zino colors to tailwind theme --- src/howitz/templates/includes/configs.html | 14 ++++++++++++++ src/howitz/templates/layouts/base.html | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/howitz/templates/includes/configs.html b/src/howitz/templates/includes/configs.html index 713e64df..203be42c 100644 --- a/src/howitz/templates/includes/configs.html +++ b/src/howitz/templates/includes/configs.html @@ -2,3 +2,17 @@ + + + \ No newline at end of file diff --git a/src/howitz/templates/layouts/base.html b/src/howitz/templates/layouts/base.html index f606ed0e..62cebd6d 100644 --- a/src/howitz/templates/layouts/base.html +++ b/src/howitz/templates/layouts/base.html @@ -16,10 +16,10 @@ - {% include "includes/configs.html" %} - {% include "includes/scripts.html" %} + {% include "includes/configs.html" %} + {% include "includes/style.html" %} From b353826d2f288bcad92ab0b06c58c611e4465a4e Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Wed, 4 Sep 2024 15:54:55 +0200 Subject: [PATCH 06/19] Adapt color palette on login page --- src/howitz/templates/components/login/sign-in-form.html | 2 +- src/howitz/templates/layouts/base.html | 2 +- src/howitz/templates/views/login.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/howitz/templates/components/login/sign-in-form.html b/src/howitz/templates/components/login/sign-in-form.html index b88aaf51..74791b47 100644 --- a/src/howitz/templates/components/login/sign-in-form.html +++ b/src/howitz/templates/components/login/sign-in-form.html @@ -32,7 +32,7 @@
diff --git a/src/howitz/templates/components/popups/modals/update-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-event-status-modal.html index 89587df4..a0d51ef1 100644 --- a/src/howitz/templates/components/popups/modals/update-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-event-status-modal.html @@ -15,12 +15,12 @@
-
+
-
+
@@ -93,7 +93,7 @@
-
+
@@ -101,7 +101,7 @@
diff --git a/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html index b022953c..05f0b4da 100644 --- a/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-singular-event-status-modal.html @@ -15,12 +15,12 @@
-
+
-
+
@@ -92,7 +92,7 @@
-
+
@@ -100,7 +100,7 @@
diff --git a/src/howitz/templates/components/row/collapse-btn.html b/src/howitz/templates/components/row/collapse-btn.html index 6089a890..224ac972 100644 --- a/src/howitz/templates/components/row/collapse-btn.html +++ b/src/howitz/templates/components/row/collapse-btn.html @@ -1,6 +1,6 @@ +
{{ event.op_state }} @@ -8,7 +8,7 @@
- +
{{ event.adm_state }} diff --git a/src/howitz/templates/components/row/data-cells.html b/src/howitz/templates/components/row/data-cells.html index 993e5bc4..da773179 100644 --- a/src/howitz/templates/components/row/data-cells.html +++ b/src/howitz/templates/components/row/data-cells.html @@ -1,16 +1,16 @@ -{{ event.id }} +{{ event.id }} {% if event.color != "" and event.color is not none %} {% with color=event.color %} {% include "/components/row/colored-data-cells.html" %} {% endwith %} {% else %} -{{ +{{ event.op_state }} -{{ event.adm_state }} +{{ event.adm_state }} {% endif %} -{{ event.age }} -{{ event.downtime }} -{{ event.router }} -{{ event.port }} -{{ event.description }} +{{ event.age }} +{{ event.downtime }} +{{ event.router }} +{{ event.port }} +{{ event.description }} diff --git a/src/howitz/templates/components/row/expand-btn.html b/src/howitz/templates/components/row/expand-btn.html index ad90a6c5..f0ffdfe0 100644 --- a/src/howitz/templates/components/row/expand-btn.html +++ b/src/howitz/templates/components/row/expand-btn.html @@ -1,6 +1,6 @@ -
+
{% endfor %} diff --git a/src/howitz/templates/components/table/events-table.html b/src/howitz/templates/components/table/events-table.html index aa41fb8e..9f2a06a4 100644 --- a/src/howitz/templates/components/table/events-table.html +++ b/src/howitz/templates/components/table/events-table.html @@ -1,5 +1,5 @@ - - - - - - - - - - + + + + + + + + + +

502

From d2b631c3e0bde4699c22d497c08d585c337f0206 Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Thu, 5 Sep 2024 11:36:52 +0200 Subject: [PATCH 11/19] Make view base darker --- .../templates/components/accordion/event-details-content.html | 2 +- src/howitz/templates/components/accordion/event-details.html | 2 +- src/howitz/templates/components/footer/footer.html | 2 +- src/howitz/templates/components/login/sign-in-form.html | 4 ++-- src/howitz/templates/components/row/event-row.html | 2 +- src/howitz/templates/components/row/modified-event-row.html | 2 +- src/howitz/templates/responses/502.html | 2 +- src/howitz/templates/responses/collapse-row.html | 2 +- src/howitz/templates/responses/update-event-response.html | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/howitz/templates/components/accordion/event-details-content.html b/src/howitz/templates/components/accordion/event-details-content.html index da222f13..54583fff 100644 --- a/src/howitz/templates/components/accordion/event-details-content.html +++ b/src/howitz/templates/components/accordion/event-details-content.html @@ -3,7 +3,7 @@
+ class="p-2 border border-b-0 border-gray-700 bg-gray-950">
{% include "/components/accordion/event-details-content.html" %} diff --git a/src/howitz/templates/components/footer/footer.html b/src/howitz/templates/components/footer/footer.html index e4a4bccf..f068e199 100644 --- a/src/howitz/templates/components/footer/footer.html +++ b/src/howitz/templates/components/footer/footer.html @@ -1,5 +1,5 @@
+ class="bg-black">
diff --git a/src/howitz/templates/components/login/sign-in-form.html b/src/howitz/templates/components/login/sign-in-form.html index 6a8d732d..d216ae86 100644 --- a/src/howitz/templates/components/login/sign-in-form.html +++ b/src/howitz/templates/components/login/sign-in-form.html @@ -11,7 +11,7 @@
+ class="mt-2 block w-full rounded-md border-0 py-1.5 bg-gray-950 text-sky-100 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-sky-600 sm:text-sm sm:leading-6">

502

diff --git a/src/howitz/templates/responses/collapse-row.html b/src/howitz/templates/responses/collapse-row.html index a0ce6faf..309dab17 100644 --- a/src/howitz/templates/responses/collapse-row.html +++ b/src/howitz/templates/responses/collapse-row.html @@ -4,7 +4,7 @@
\ No newline at end of file diff --git a/src/howitz/templates/responses/update-event-response.html b/src/howitz/templates/responses/update-event-response.html index b1bb2062..a31a30e0 100644 --- a/src/howitz/templates/responses/update-event-response.html +++ b/src/howitz/templates/responses/update-event-response.html @@ -34,7 +34,7 @@ {% include "/components/accordion/event-details-content.html" %} From 0d97c029481c4542135503f5cb44e4088b34be0b Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Thu, 5 Sep 2024 11:42:52 +0200 Subject: [PATCH 12/19] fixup --- .../accordion/event-attributes.html | 4 ++-- .../accordion/event-details-content.html | 2 +- .../components/accordion/event-details.html | 2 +- .../accordion/event-messages-block.html | 2 +- .../components/accordion/event-messages.html | 8 +++---- .../appbar-placeholder.html | 2 +- .../error-appbar-content.html | 2 +- .../components/login/sign-in-form.html | 4 ++-- .../templates/components/navbar/navbar.html | 2 +- .../navbar/user-dropdown-menu-expanded.html | 4 ++-- .../navbar/user-menu-btn-expanded.html | 2 +- .../components/navbar/user-menu-btn.html | 2 +- .../popups/alerts/error/error-alert.html | 4 ++-- .../bulk-update-menu/bulk-update-menu.html | 2 +- .../popups/modals/table-operation-modal.html | 10 ++++---- .../modals/update-event-status-modal.html | 16 ++++++------- .../update-singular-event-status-modal.html | 16 ++++++------- .../components/row/collapse-btn.html | 2 +- .../components/row/colored-data-cells.html | 4 ++-- .../templates/components/row/data-cells.html | 16 ++++++------- .../components/row/event-checked-box.html | 4 ++-- .../templates/components/row/event-row.html | 2 +- .../components/row/event-unchecked-box.html | 4 ++-- .../templates/components/row/expand-btn.html | 2 +- .../components/row/expanded-row.html | 2 +- .../components/row/modified-event-row.html | 6 ++--- .../components/row/table-row-skeleton.html | 4 ++-- .../components/table/events-table.html | 24 +++++++++---------- .../components/toolbar/column-toggle-btn.html | 2 +- .../components/toolbar/table-filter-btn.html | 2 +- .../components/toolbar/table-sort-btn.html | 2 +- src/howitz/templates/responses/502.html | 2 +- .../templates/responses/checked-box.html | 2 +- .../responses/collapse-error-alert.html | 2 +- .../templates/responses/collapse-row.html | 2 +- .../responses/expand-error-alert.html | 2 +- .../templates/responses/unchecked-box.html | 2 +- .../responses/update-event-response.html | 4 ++-- 38 files changed, 88 insertions(+), 88 deletions(-) diff --git a/src/howitz/templates/components/accordion/event-attributes.html b/src/howitz/templates/components/accordion/event-attributes.html index 978089d0..53281e44 100644 --- a/src/howitz/templates/components/accordion/event-attributes.html +++ b/src/howitz/templates/components/accordion/event-attributes.html @@ -1,9 +1,9 @@ -
+
Attributes
-
    +
      {% for attr_key in event_attr.keys() %} {% if event_attr.get(attr_key) %} diff --git a/src/howitz/templates/components/accordion/event-details-content.html b/src/howitz/templates/components/accordion/event-details-content.html index 54583fff..ea198505 100644 --- a/src/howitz/templates/components/accordion/event-details-content.html +++ b/src/howitz/templates/components/accordion/event-details-content.html @@ -3,7 +3,7 @@
      + class="p-2 border border-b-0 border-zinc-700 bg-zinc-950">
      {% include "/components/accordion/event-details-content.html" %} diff --git a/src/howitz/templates/components/accordion/event-messages-block.html b/src/howitz/templates/components/accordion/event-messages-block.html index 454f1db7..c9a1af3a 100644 --- a/src/howitz/templates/components/accordion/event-messages-block.html +++ b/src/howitz/templates/components/accordion/event-messages-block.html @@ -1,7 +1,7 @@
      + class="basis-0 grow overflow-y-scroll overflow-x-auto p-5 border rounded-2xl shadow sm:p-5 bg-zinc-800 border-zinc-700">
      Logs & History
      diff --git a/src/howitz/templates/components/accordion/event-messages.html b/src/howitz/templates/components/accordion/event-messages.html index 08465aab..3f98f2b1 100644 --- a/src/howitz/templates/components/accordion/event-messages.html +++ b/src/howitz/templates/components/accordion/event-messages.html @@ -2,19 +2,19 @@
        + class="relative border-l border-zinc-700"> {% for msg in event_msgs %}
      • -
        -

        +
        +

        {{ msg.user }}

        -

        {{ msg.log }}

        +

        {{ msg.log }}

      • diff --git a/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html b/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html index 0dbc901a..89504f78 100644 --- a/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html +++ b/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html @@ -15,7 +15,7 @@ style="clip-path: polygon(74.8% 41.9%, 97.2% 73.2%, 100% 34.9%, 92.5% 0.4%, 87.5% 0%, 75% 28.6%, 58.5% 54.6%, 50.1% 56.8%, 46.9% 44%, 48.3% 17.4%, 24.7% 53.9%, 0% 27.9%, 11.9% 74.2%, 24.9% 54.1%, 68.6% 100%, 74.8% 41.9%)">
      -

      +

      Connected to Zino

      -

      +

      Connection timed out

      + class="mt-2 block w-full rounded-md border-0 py-1.5 bg-zinc-950 text-sky-100 shadow-sm ring-1 ring-inset ring-zinc-300 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-sky-600 sm:text-sm sm:leading-6">
    diff --git a/src/howitz/templates/components/navbar/user-menu-btn-expanded.html b/src/howitz/templates/components/navbar/user-menu-btn-expanded.html index 5621e67b..51fec701 100644 --- a/src/howitz/templates/components/navbar/user-menu-btn-expanded.html +++ b/src/howitz/templates/components/navbar/user-menu-btn-expanded.html @@ -1,5 +1,5 @@
diff --git a/src/howitz/templates/components/popups/modals/update-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-event-status-modal.html index a0d51ef1..dad6ba8b 100644 --- a/src/howitz/templates/components/popups/modals/update-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-event-status-modal.html @@ -6,7 +6,7 @@ hx-target-error="body" >
- + {% if event.color != "" and event.color is not none %} {% with color=event.color %} {% include "/components/row/colored-data-cells.html" %} {% endwith %} {% else %} - - + {% endif %} - - - - - + + + + + diff --git a/src/howitz/templates/components/row/event-checked-box.html b/src/howitz/templates/components/row/event-checked-box.html index 6cbfbc77..9166bb10 100644 --- a/src/howitz/templates/components/row/event-checked-box.html +++ b/src/howitz/templates/components/row/event-checked-box.html @@ -4,7 +4,7 @@ class="flex items-center"> {% include "/components/accordion/event-details-content.html" %} @@ -41,7 +41,7 @@ {% else %} {% with id=event.event.id, event=event.event, is_selected=event.selected %} {% for n in range(10) %} {% endfor %} diff --git a/src/howitz/templates/components/table/events-table.html b/src/howitz/templates/components/table/events-table.html index 9f2a06a4..31053915 100644 --- a/src/howitz/templates/components/table/events-table.html +++ b/src/howitz/templates/components/table/events-table.html @@ -1,22 +1,22 @@
#OP-STATEADM-STATEAGEDOWNTIMEROUTERPORTDESCRIPTION#OP-STATEADM-STATEAGEDOWNTIMEROUTERPORTDESCRIPTION
+
{{ event.op_state }} @@ -8,7 +8,7 @@
+
{{ event.adm_state }} diff --git a/src/howitz/templates/components/row/data-cells.html b/src/howitz/templates/components/row/data-cells.html index da773179..70b5226f 100644 --- a/src/howitz/templates/components/row/data-cells.html +++ b/src/howitz/templates/components/row/data-cells.html @@ -1,16 +1,16 @@ -
{{ event.id }}{{ event.id }}{{ +{{ event.op_state }} {{ event.adm_state }}{{ event.adm_state }}{{ event.age }}{{ event.downtime }}{{ event.router }}{{ event.port }}{{ event.description }}{{ event.age }}{{ event.downtime }}{{ event.router }}{{ event.port }}{{ event.description }}
-
+
- + - - - - - - - - - - + + + + + + + + + + - \ No newline at end of file diff --git a/src/howitz/templates/responses/expand-error-alert.html b/src/howitz/templates/responses/expand-error-alert.html index d5a09cd9..f4748780 100644 --- a/src/howitz/templates/responses/expand-error-alert.html +++ b/src/howitz/templates/responses/expand-error-alert.html @@ -12,7 +12,7 @@ hx-get="/alert/{{ alert_id }}/show-minimized-error" hx-target="#error-msg-{{ alert_id }}-maximized" hx-swap="delete" - class="ms-auto -my-1.5 bg-opacity-20 bg-white text-gray-400 hover:text-gray-100 rounded-lg focus:ring-2 focus:ring-gray-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" + class="ms-auto -my-1.5 bg-opacity-20 bg-white text-zinc-400 hover:text-zinc-100 rounded-lg focus:ring-2 focus:ring-zinc-300 p-1.5 hover:bg-orange-400/70 inline-flex items-center justify-center h-8 w-8" aria-label="Collapse alert"> Collapse alert {% include "/components/popups/alerts/error/minimize-icon.svg" %} diff --git a/src/howitz/templates/responses/unchecked-box.html b/src/howitz/templates/responses/unchecked-box.html index 70747c0e..636bc666 100644 --- a/src/howitz/templates/responses/unchecked-box.html +++ b/src/howitz/templates/responses/unchecked-box.html @@ -1,7 +1,7 @@
{% include "/components/accordion/event-details-content.html" %} From 5b94a1d54429f2094fb2f89298025d07e970dee0 Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Thu, 5 Sep 2024 11:56:16 +0200 Subject: [PATCH 13/19] Convert zinogreen to color grid --- src/howitz/templates/includes/configs.html | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/howitz/templates/includes/configs.html b/src/howitz/templates/includes/configs.html index 027c52b9..2e899ab8 100644 --- a/src/howitz/templates/includes/configs.html +++ b/src/howitz/templates/includes/configs.html @@ -9,8 +9,20 @@ theme: { extend: { colors: { - zinogreen: '#4AF626', zinogray: 'rgba(255, 255, 255, 0.4)', + zinogreen: { + 50: '#ecffe5', + 100: '#d5ffc7', + 200: '#acff95', + 300: '#76ff57', + 400: '#4af626', + 500: '#27dc06', + 600: '#18b100', + 700: '#148605', + 800: '#16690b', + 900: '#14590e', + 950: '#043201', + }, } } } From 11152e42574fccac187f777b82571ecdb584c382 Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Thu, 5 Sep 2024 11:56:28 +0200 Subject: [PATCH 14/19] fixup --- src/howitz/templates/components/login/sign-in-form.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/howitz/templates/components/login/sign-in-form.html b/src/howitz/templates/components/login/sign-in-form.html index 6c68b151..194cc899 100644 --- a/src/howitz/templates/components/login/sign-in-form.html +++ b/src/howitz/templates/components/login/sign-in-form.html @@ -32,7 +32,7 @@
diff --git a/src/howitz/templates/responses/502.html b/src/howitz/templates/responses/502.html index d2fb90d0..66d3818a 100644 --- a/src/howitz/templates/responses/502.html +++ b/src/howitz/templates/responses/502.html @@ -1,6 +1,6 @@ {% block content %}

502

diff --git a/src/howitz/templates/views/login.html b/src/howitz/templates/views/login.html index 07a8df0b..be32c2eb 100644 --- a/src/howitz/templates/views/login.html +++ b/src/howitz/templates/views/login.html @@ -17,7 +17,7 @@

Login page

{% include "/includes/zino-logo.svg" %} {% endwith %} -

Sign in to Zino

+

Sign in to Zino

From 6716d39b7c26c75868c3025e590a913ce041bfbf Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Thu, 5 Sep 2024 12:06:12 +0200 Subject: [PATCH 16/19] Replace teal color with zinogreen --- .../feedback/connection-status-bar/appbar-placeholder.html | 6 +++--- .../connection-status-bar/success-appbar-content.html | 6 +++--- .../components/popups/modals/table-operation-modal.html | 4 ++-- src/howitz/templates/components/table/events-table.html | 2 +- .../templates/components/toolbar/column-toggle-btn.html | 6 +++--- .../templates/components/toolbar/table-filter-btn.html | 6 +++--- src/howitz/templates/components/toolbar/table-sort-btn.html | 6 +++--- src/howitz/templates/responses/502.html | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html b/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html index 89504f78..e64ebbe2 100644 --- a/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html +++ b/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html @@ -2,16 +2,16 @@ id="connection-state-appbar" >
diff --git a/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html b/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html index db85220c..8a25ebe1 100644 --- a/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html +++ b/src/howitz/templates/components/feedback/connection-status-bar/success-appbar-content.html @@ -2,15 +2,15 @@
+ class="relative isolate flex justify-center gap-x-6 bg-zinogreen-900 overflow-hidden px-6 py-0.5">
diff --git a/src/howitz/templates/components/popups/modals/table-operation-modal.html b/src/howitz/templates/components/popups/modals/table-operation-modal.html index ee2569cb..1432ee5f 100644 --- a/src/howitz/templates/components/popups/modals/table-operation-modal.html +++ b/src/howitz/templates/components/popups/modals/table-operation-modal.html @@ -16,7 +16,7 @@
-
@@ -39,7 +39,7 @@
diff --git a/src/howitz/templates/components/table/events-table.html b/src/howitz/templates/components/table/events-table.html index 31053915..85612625 100644 --- a/src/howitz/templates/components/table/events-table.html +++ b/src/howitz/templates/components/table/events-table.html @@ -6,7 +6,7 @@ hx-trigger="load" >
- + diff --git a/src/howitz/templates/components/toolbar/column-toggle-btn.html b/src/howitz/templates/components/toolbar/column-toggle-btn.html index 8ae1059b..d566134f 100644 --- a/src/howitz/templates/components/toolbar/column-toggle-btn.html +++ b/src/howitz/templates/components/toolbar/column-toggle-btn.html @@ -1,11 +1,11 @@
- diff --git a/src/howitz/templates/components/toolbar/table-filter-btn.html b/src/howitz/templates/components/toolbar/table-filter-btn.html index cef08f3a..f2094a5b 100644 --- a/src/howitz/templates/components/toolbar/table-filter-btn.html +++ b/src/howitz/templates/components/toolbar/table-filter-btn.html @@ -1,11 +1,11 @@
- diff --git a/src/howitz/templates/components/toolbar/table-sort-btn.html b/src/howitz/templates/components/toolbar/table-sort-btn.html index ea5528a1..b2df9b5a 100644 --- a/src/howitz/templates/components/toolbar/table-sort-btn.html +++ b/src/howitz/templates/components/toolbar/table-sort-btn.html @@ -1,5 +1,5 @@
- diff --git a/src/howitz/templates/responses/502.html b/src/howitz/templates/responses/502.html index 66d3818a..08b5a516 100644 --- a/src/howitz/templates/responses/502.html +++ b/src/howitz/templates/responses/502.html @@ -5,7 +5,7 @@

502

Bad Gateway

-

{{ err_msg }}

+

{{ err_msg }}

{% endblock %} From 07e03df86c77742d189223a5515a59ab4963b9e8 Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Thu, 5 Sep 2024 12:39:44 +0200 Subject: [PATCH 17/19] Replace blue color with zinogreen --- .../components/accordion/event-actions-buttons.html | 4 ++-- .../templates/components/accordion/event-messages.html | 2 +- .../templates/components/accordion/update-state-btn.html | 2 +- .../popups/bulk-update-menu/bulk-update-buttons.html | 6 +++--- .../components/popups/modals/update-event-status-modal.html | 4 ++-- .../popups/modals/update-singular-event-status-modal.html | 4 ++-- src/howitz/templates/components/row/event-checked-box.html | 4 ++-- .../templates/components/row/event-unchecked-box.html | 4 ++-- src/howitz/templates/responses/checked-box.html | 2 +- src/howitz/templates/responses/unchecked-box.html | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/howitz/templates/components/accordion/event-actions-buttons.html b/src/howitz/templates/components/accordion/event-actions-buttons.html index 674689ff..d7438ad7 100644 --- a/src/howitz/templates/components/accordion/event-actions-buttons.html +++ b/src/howitz/templates/components/accordion/event-actions-buttons.html @@ -11,7 +11,7 @@ hx-target="#event-accordion-row-{{ id }}" hx-swap="outerHTML show:#event-msg-feed-{{ id }}:bottom" hx-indicator="#row-{{ id }}-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800" + class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800" > Poll @@ -22,7 +22,7 @@ hx-target="#event-accordion-row-{{ id }}" hx-swap="outerHTML show:#event-msg-feed-{{ id }}:bottom" hx-indicator="#row-{{ id }}-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Clear Flapping {% endif %} diff --git a/src/howitz/templates/components/accordion/event-messages.html b/src/howitz/templates/components/accordion/event-messages.html index 3f98f2b1..d9d42473 100644 --- a/src/howitz/templates/components/accordion/event-messages.html +++ b/src/howitz/templates/components/accordion/event-messages.html @@ -6,7 +6,7 @@ {% for msg in event_msgs %}
  • -
    +

    {{ msg.user }}

    diff --git a/src/howitz/templates/components/accordion/update-state-btn.html b/src/howitz/templates/components/accordion/update-state-btn.html index b335174d..507666b6 100644 --- a/src/howitz/templates/components/accordion/update-state-btn.html +++ b/src/howitz/templates/components/accordion/update-state-btn.html @@ -3,7 +3,7 @@ hx-get="event/{{ id }}/update_status" hx-target="body" hx-swap="beforeend" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800" + class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 mb-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800" > Update Status diff --git a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html index 6b9fa693..9afcbb09 100644 --- a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html +++ b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-buttons.html @@ -5,7 +5,7 @@ hx-get="/show_update_status_modal" hx-target="body" hx-swap="beforeend" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800" + class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800" > Update Status @@ -17,7 +17,7 @@ hx-trigger="click" id="bulk-poll-events" hx-indicator="#bulk-poll-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Poll @@ -29,7 +29,7 @@ hx-trigger="click" id="bulk-clear-flapping" hx-indicator="#bulk-clear-flapping-indicator" - class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-blue-600 hover:bg-blue-700 focus:outline-none focus:ring-blue-800"> + class="text-white focus:ring-4 font-medium rounded-lg text-sm px-3 py-2 mr-2 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800"> Clear Flapping {% endif %} diff --git a/src/howitz/templates/components/popups/modals/update-event-status-modal.html b/src/howitz/templates/components/popups/modals/update-event-status-modal.html index dad6ba8b..fdfdfd0e 100644 --- a/src/howitz/templates/components/popups/modals/update-event-status-modal.html +++ b/src/howitz/templates/components/popups/modals/update-event-status-modal.html @@ -39,7 +39,7 @@
  • - + diff --git a/src/howitz/templates/components/toolbar/column-toggle-btn.html b/src/howitz/templates/components/toolbar/column-toggle-btn.html index d566134f..02aca137 100644 --- a/src/howitz/templates/components/toolbar/column-toggle-btn.html +++ b/src/howitz/templates/components/toolbar/column-toggle-btn.html @@ -1,11 +1,11 @@
    - diff --git a/src/howitz/templates/components/toolbar/table-filter-btn.html b/src/howitz/templates/components/toolbar/table-filter-btn.html index f2094a5b..47bc2841 100644 --- a/src/howitz/templates/components/toolbar/table-filter-btn.html +++ b/src/howitz/templates/components/toolbar/table-filter-btn.html @@ -1,11 +1,11 @@
    - diff --git a/src/howitz/templates/components/toolbar/table-sort-btn.html b/src/howitz/templates/components/toolbar/table-sort-btn.html index b2df9b5a..46ed7fc3 100644 --- a/src/howitz/templates/components/toolbar/table-sort-btn.html +++ b/src/howitz/templates/components/toolbar/table-sort-btn.html @@ -1,5 +1,5 @@
    -
    #OP-STATEADM-STATEAGEDOWNTIMEROUTERPORTDESCRIPTION#OP-STATEADM-STATEAGEDOWNTIMEROUTERPORTDESCRIPTION
    # OP-STATE
    # OP-STATE