From 1a82a3f717970736cf070f3346f953ac33a034ca Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Wed, 6 Aug 2025 08:54:26 +0200 Subject: [PATCH 01/43] add uncommited styles on master --- src/argus/htmx/static/styles.css | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/argus/htmx/static/styles.css b/src/argus/htmx/static/styles.css index 400491f59..669836c7e 100644 --- a/src/argus/htmx/static/styles.css +++ b/src/argus/htmx/static/styles.css @@ -4413,10 +4413,6 @@ details.collapse summary::-webkit-details-marker { flex-basis: 20%; } -.border-collapse { - border-collapse: collapse; -} - .border-separate { border-collapse: separate; } @@ -4517,10 +4513,6 @@ details.collapse summary::-webkit-details-marker { column-gap: 1rem; } -.gap-y-2 { - row-gap: 0.5rem; -} - .space-y-2 > :not([hidden]) ~ :not([hidden]) { --tw-space-y-reverse: 0; margin-top: calc(0.5rem * calc(1 - var(--tw-space-y-reverse))); @@ -4695,7 +4687,7 @@ details.collapse summary::-webkit-details-marker { .bg-red-700 { --tw-bg-opacity: 1; - background-color: rgb(185 28 28 / var(--tw-bg-opacity)); + background-color: rgb(185 28 28 / var(--tw-bg-opacity, 1)); } .bg-severity-primary-1 { @@ -4930,10 +4922,6 @@ details.collapse summary::-webkit-details-marker { color: var(--fallback-nc,oklch(var(--nc)/var(--tw-text-opacity, 1))); } -.text-neutral-content\/80 { - color: var(--fallback-nc,oklch(var(--nc)/0.8)); -} - .text-primary { --tw-text-opacity: 1; color: var(--fallback-p,oklch(var(--p)/var(--tw-text-opacity, 1))); @@ -4971,7 +4959,7 @@ details.collapse summary::-webkit-details-marker { .text-white { --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity)); + color: rgb(255 255 255 / var(--tw-text-opacity, 1)); } .antialiased { From 01bb33037dc5de9239c1a1284c993165be8315a0 Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Wed, 6 Aug 2025 09:20:08 +0200 Subject: [PATCH 02/43] Run npx @tailwindcss/upgrade --- src/argus/htmx/tailwindtheme/snippets/10-tailwind.css | 4 +--- src/argus/htmx/tailwindtheme/styles.css | 6 +++--- .../htmx/templates/htmx/forms/dropdown_select_multiple.html | 2 +- .../templates/htmx/incident/_filter_update_dropdown.html | 2 +- .../htmx/incident/_incident_table_cell_wrapper_default.html | 2 +- .../_incident_table_cell_wrapper_link_to_details.html | 2 +- .../notificationprofile/_notificationprofile_form_div.html | 2 +- src/argus/htmx/templates/htmx/user/_user_menu.html | 2 +- src/argus/htmx/templates/htmx_base.html | 4 ++-- 9 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/argus/htmx/tailwindtheme/snippets/10-tailwind.css b/src/argus/htmx/tailwindtheme/snippets/10-tailwind.css index b5c61c956..d4b507858 100644 --- a/src/argus/htmx/tailwindtheme/snippets/10-tailwind.css +++ b/src/argus/htmx/tailwindtheme/snippets/10-tailwind.css @@ -1,3 +1 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import 'tailwindcss'; diff --git a/src/argus/htmx/tailwindtheme/styles.css b/src/argus/htmx/tailwindtheme/styles.css index 5597f7256..187c04969 100644 --- a/src/argus/htmx/tailwindtheme/styles.css +++ b/src/argus/htmx/tailwindtheme/styles.css @@ -1,3 +1,3 @@ -@import 'snippets/10-tailwind.css'; -@import 'snippets/15-alert-message.css'; -@import 'snippets/20-loading-box.css'; +@import './snippets/10-tailwind.css'; +@import './snippets/15-alert-message.css'; +@import './snippets/20-loading-box.css'; diff --git a/src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html b/src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html index 7ed782ff1..269d98f5b 100644 --- a/src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html +++ b/src/argus/htmx/templates/htmx/forms/dropdown_select_multiple.html @@ -25,7 +25,7 @@ {% endfor %}