From a43989982a9674d41914c2b766c46aade88f3540 Mon Sep 17 00:00:00 2001 From: podliashanyk <60876078+podliashanyk@users.noreply.github.com> Date: Thu, 5 Sep 2024 13:53:35 +0200 Subject: [PATCH] Add proper logo and adapt color palette (#157) * Add logo file * Add flexible height in logo svg * Add logo to login page and navbar * Add zino colors to tailwind theme * Adapt color palette on login page, navbar and user menu * Replace slate color with zinc (is a correct alternative of zinogray) * Make view base darker * Replace sky, teal and blue colors with zinogreen * Smooth out zinogreen related colors on login and main pages --- .../accordion/event-actions-buttons.html | 4 +- .../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 +- .../accordion/update-state-btn.html | 2 +- .../appbar-placeholder.html | 8 +- .../error-appbar-content.html | 2 +- .../success-appbar-content.html | 6 +- .../templates/components/footer/footer.html | 2 +- .../components/login/sign-in-form.html | 10 +-- .../templates/components/navbar/navbar.html | 10 ++- .../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-buttons.html | 6 +- .../bulk-update-menu/bulk-update-menu.html | 2 +- .../popups/modals/forms/sort-table-form.html | 6 +- .../popups/modals/table-operation-modal.html | 12 +-- .../modals/update-event-status-modal.html | 18 ++-- .../update-singular-event-status-modal.html | 18 ++-- .../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 | 26 +++--- .../components/toolbar/column-toggle-btn.html | 6 +- .../components/toolbar/table-filter-btn.html | 6 +- .../components/toolbar/table-sort-btn.html | 6 +- src/howitz/templates/includes/configs.html | 26 ++++++ src/howitz/templates/includes/zino-logo.svg | 90 ++++++++++++++++--- src/howitz/templates/layouts/base.html | 6 +- src/howitz/templates/responses/502.html | 4 +- .../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 +- src/howitz/templates/views/login.html | 8 +- 48 files changed, 237 insertions(+), 137 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..7c13543e 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-black 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-black 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-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 da222f13..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..843a2f96 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/accordion/update-state-btn.html b/src/howitz/templates/components/accordion/update-state-btn.html index b335174d..a23bc2a0 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-black 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/feedback/connection-status-bar/appbar-placeholder.html b/src/howitz/templates/components/feedback/connection-status-bar/appbar-placeholder.html index 0dbc901a..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,20 +2,20 @@ id="connection-state-appbar" >
        -

        +

        Connected to Zino

        -

        +

        Connection timed out

        + 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/footer/footer.html b/src/howitz/templates/components/footer/footer.html index d8cb760f..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 b88aaf51..7b0f5608 100644 --- a/src/howitz/templates/components/login/sign-in-form.html +++ b/src/howitz/templates/components/login/sign-in-form.html @@ -9,9 +9,9 @@ hx-target-403="form p" >
        - + + class="mt-2 block w-full rounded-md border-0 py-1.5 bg-zinc-950 text-white shadow-sm ring-1 ring-inset ring-zinc-300 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-zinogreen-600 sm:text-sm sm:leading-6">
        - + + class="mt-2 block w-full rounded-md border-0 py-1.5 bg-zinc-950 text-white shadow-sm ring-1 ring-inset ring-zinc-300 placeholder:text-zinc-400 focus:ring-2 focus:ring-inset focus:ring-zinogreen-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 d8164beb..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 @@ @@ -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-black 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-black 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/bulk-update-menu/bulk-update-menu.html b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html index fee9d9f7..f96646f6 100644 --- a/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html +++ b/src/howitz/templates/components/popups/bulk-update-menu/bulk-update-menu.html @@ -1,5 +1,5 @@
      + class="sticky bottom-0 z-20 flex flex-row items-center justify-between w-full max-h-fit p-2 border-t bg-zinc-700 border-zinc-600"> {% include "/components/popups/bulk-update-menu/bulk-update-progress.html" %} diff --git a/src/howitz/templates/components/popups/modals/forms/sort-table-form.html b/src/howitz/templates/components/popups/modals/forms/sort-table-form.html index 6bd3f8a1..41a6411e 100644 --- a/src/howitz/templates/components/popups/modals/forms/sort-table-form.html +++ b/src/howitz/templates/components/popups/modals/forms/sort-table-form.html @@ -12,12 +12,12 @@
      + class="h-4 w-4 bg-zinogreen-100/40 border-white text-zinogreen-600 focus:ring-zinogreen-600">
      -

      {{ sort.description }}

      +

      {{ sort.description }}

      {% endfor %} @@ -33,7 +33,7 @@ hx-target="#eventlist-list" hx-swap="innerHTML" hx-indicator="#bulk-update-indicator" - class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-sky-700 hover:bg-sky-800 focus:outline-none focus:ring-sky-900"> + class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-zinogreen-700 hover:bg-zinogreen-800 focus:outline-none focus:ring-zinogreen-900"> Save 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 b5332225..a858ae9e 100644 --- a/src/howitz/templates/components/popups/modals/table-operation-modal.html +++ b/src/howitz/templates/components/popups/modals/table-operation-modal.html @@ -7,7 +7,7 @@ hx-swap-oob="true" > @@ -15,12 +15,12 @@
      -
      -

      +

      -
      +
      -
      +
      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..c4e0c239 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" >