Skip to content

Commit

Permalink
Smooth out zinogreen related colors on main page
Browse files Browse the repository at this point in the history
  • Loading branch information
podliashanyk committed Sep 5, 2024
1 parent 24ea309 commit b946be8
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-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
</button>
Expand All @@ -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-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-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
</button>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
{% for msg in event_msgs %}
<li class="mb-3 ml-4">

<div class="absolute w-3 h-3 rounded-full mt-1.5 -left-1.5 border border-zinc-900 {% if msg.user %} bg-orange-400 {% else %} bg-zinogreen-400 {% endif %}"></div>
<div class="absolute w-3 h-3 rounded-full mt-1.5 -left-1.5 border border-zinc-900 {% if msg.user %} bg-zinogreen-50 {% else %} bg-zinogreen-400 {% endif %}"></div>
<h3 class="mb-1 text-xs font-normal leading-none text-zinc-400">
{{ msg.user }}
</h3>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-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
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -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-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-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"
>
Update Status
</button>
Expand All @@ -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-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-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
</button>

Expand All @@ -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-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-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
</button>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="text-sm">
<label for="{{ sort }}"
class="block font-medium">{{ sort.display_name }}</label>
<p class="text-xs text-zinogreen-100/40">{{ sort.description }}</p>
<p class="text-xs text-white/60">{{ sort.description }}</p>
</div>
</div>
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<div class="relative transform overflow-x-auto overflow-y-auto rounded-lg bg-white text-left shadow-xl sm:my-8 sm:w-full sm:max-w-3xl w-fit">
<div class="bg-zinc-800 px-4 py-4">
<h3 class="text-lg font-semibold leading-6 text-center text-zinogreen-200"
<h3 class="text-lg font-semibold leading-6 text-center text-white"
id="modal-title">{{ modal_title }}</h3>
</div>

Expand All @@ -39,7 +39,7 @@
<div class="bg-zinc-800 px-4 py-3 sm:flex sm:flex-row-reverse sm:px-6">
<button
hx-on:click="htmx.addClass(htmx.find('#{{ modal_id }}'), 'invisible')"
class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-zinogreen-200 shadow-sm ring-1 ring-inset ring-zinogreen-200 hover:bg-zinc-600 sm:mt-0 sm:w-auto">
class="mt-3 inline-flex w-full justify-center rounded-md bg-zinc-800 px-3 py-2 text-sm font-semibold text-white shadow-sm ring-1 ring-inset ring-white hover:bg-zinc-600 sm:mt-0 sm:w-auto">
Close
</button>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3 class="text-lg font-semibold leading-6 text-white" id="modal-title">Update s
hx-trigger="click"
hx-indicator="#bulk-update-indicator"
hx-target-400="#generic-400-error"
class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800">
class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-black rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800">
Update events

</button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3 class="text-lg font-semibold leading-6 text-white" id="modal-title">Update e
hx-swap="outerHTML show:#ol-event-{{ id }}:bottom"
hx-indicator="#bulk-update-indicator"
hx-target-400="#generic-400-error"
class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-white rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800">
class="mr-1 inline-flex items-center py-2 px-4 font-medium text-center text-black rounded-lg focus:ring-4 bg-zinogreen-600 hover:bg-zinogreen-700 focus:outline-none focus:ring-zinogreen-800">
Update event
</button>

Expand Down
2 changes: 1 addition & 1 deletion src/howitz/templates/components/table/events-table.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
hx-trigger="load"
>
<thead class="sticky top-0 z-20 text-xs text-center uppercase bg-zinc-700 text-zinc-100">
<tr class="text-zinogreen-100 text-nowrap">
<tr class="text-white text-nowrap">
<th scope="col" class="border border-zinc-600 px-2 py-2"></th>
<th scope="col" class="border border-zinc-600 px-2 py-2">#</th>
<th scope="col" class="border border-zinc-600 px-2 py-2">OP-STATE</th>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="relative flex flex-col items-center">
<button class="block bg-zinc-600/90 hover:bg-zinc-500 rounded-md m-1.5 size-9 focus:ring-2 focus:outline-none focus:ring-zinogreen-300"
<button class="block bg-zinc-600/90 hover:bg-zinc-500 rounded-md m-1.5 size-9 focus:ring-2 focus:outline-none focus:ring-zinogreen-400"
hx-on:mouseenter="htmx.removeClass(htmx.find('#toggle-popover'), 'invisible')"
hx-on:mouseleave="htmx.addClass(htmx.find('#toggle-popover'), 'invisible')"
hx-on:click="htmx.removeClass(htmx.find('#column-toggle-menu-dropdown'), 'invisible')"
aria-describedby="toggle-popover"
>
<svg class="fill-zinogreen-300/90 hover:fill-zinogreen-300 p-1.5 size-full"
<svg class="fill-zinogreen-400/90 hover:fill-zinogreen-400 p-1.5 size-full"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 576 512">
<!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
Expand All @@ -14,7 +14,7 @@
</button>

<p id="toggle-popover" role="tooltip"
class="absolute -top-4 h-fit z-40 invisible flow-root w-fit text-xs font-semibold text-nowrap text-zinogreen-900 transition-opacity duration-300 bg-zinogreen-300 rounded-md px-1 py-0.5"
class="absolute -top-4 h-fit z-40 invisible flow-root w-fit text-xs font-semibold text-nowrap text-zinogreen-950 transition-opacity duration-300 bg-zinogreen-400 rounded-md px-1 py-0.5"
>
Toggle columns
</p>
Expand Down
6 changes: 3 additions & 3 deletions src/howitz/templates/components/toolbar/table-filter-btn.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<div class="relative flex flex-col items-center">
<button class="block bg-zinc-600/90 hover:bg-zinc-500 rounded-md m-1.5 size-9 focus:ring-2 focus:outline-none focus:ring-zinogreen-300"
<button class="block bg-zinc-600/90 hover:bg-zinc-500 rounded-md m-1.5 size-9 focus:ring-2 focus:outline-none focus:ring-zinogreen-400"
hx-on:mouseenter="htmx.removeClass(htmx.find('#filter-popover'), 'invisible')"
hx-on:mouseleave="htmx.addClass(htmx.find('#filter-popover'), 'invisible')"
hx-on:click="htmx.removeClass(htmx.find('#filter-menu-dropdown'), 'invisible')"
aria-describedby="filter-popover"
>
<svg class="fill-zinogreen-300/90 hover:fill-zinogreen-300 p-1.5 size-full"
<svg class="fill-zinogreen-400/90 hover:fill-zinogreen-400 p-1.5 size-full"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 512 512">
<!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
Expand All @@ -14,7 +14,7 @@
</button>

<p id="filter-popover" role="tooltip"
class="absolute -top-4 h-fit z-40 invisible flow-root w-fit text-xs font-semibold text-nowrap text-zinogreen-900 transition-opacity duration-300 bg-zinogreen-300 rounded-md px-1 py-0.5"
class="absolute -top-4 h-fit z-40 invisible flow-root w-fit text-xs font-semibold text-nowrap text-zinogreen-950 transition-opacity duration-300 bg-zinogreen-400 rounded-md px-1 py-0.5"
>
Filter events
</p>
Expand Down
6 changes: 3 additions & 3 deletions src/howitz/templates/components/toolbar/table-sort-btn.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="relative flex flex-col items-center">
<button class="block bg-zinc-600/90 hover:bg-zinc-500 rounded-md m-1.5 size-9 focus:ring-2 focus:outline-none focus:ring-zinogreen-300"
<button class="block bg-zinc-600/90 hover:bg-zinc-500 rounded-md m-1.5 size-9 focus:ring-2 focus:outline-none focus:ring-zinogreen-400"
hx-on:mouseenter="htmx.removeClass(htmx.find('#sort-popover'), 'invisible')"
hx-on:mouseleave="htmx.addClass(htmx.find('#sort-popover'), 'invisible')"
hx-on:click="htmx.removeClass(htmx.find('#sort-menu-dropdown'), 'invisible')"
Expand All @@ -9,7 +9,7 @@
hx-trigger="click"
aria-describedby="sort-popover"
>
<svg class="fill-zinogreen-300/90 hover:fill-zinogreen-300 p-1.5 size-full"
<svg class="fill-zinogreen-400/90 hover:fill-zinogreen-400 p-1.5 size-full"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 576 512">
<!--!Font Awesome Free 6.5.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2024 Fonticons, Inc.-->
Expand All @@ -18,7 +18,7 @@
</button>

<p id="sort-popover" role="tooltip"
class="absolute -top-4 h-fit z-40 invisible flow-root w-fit text-xs font-semibold text-nowrap text-zinogreen-900 transition-opacity duration-300 bg-zinogreen-300 rounded-md px-1 py-0.5"
class="absolute -top-4 h-fit z-40 invisible flow-root w-fit text-xs font-semibold text-nowrap text-zinogreen-950 transition-opacity duration-300 bg-zinogreen-400 rounded-md px-1 py-0.5"
>
Sort events
</p>
Expand Down

0 comments on commit b946be8

Please sign in to comment.