From 1052797701f4c1addde6440e61b85ea6728227f1 Mon Sep 17 00:00:00 2001 From: Brian Helba Date: Fri, 22 May 2026 18:39:01 -0400 Subject: [PATCH 1/2] Upgrade the Tailwind / DaisyUI stack --- .../templates/core/collection_create_doi.html | 8 +- .../core/collection_create_or_edit.html | 6 +- .../templates/core/collection_detail.html | 4 +- isic/core/templates/core/collection_list.html | 12 +- isic/core/templates/core/data_explorer.html | 12 +- isic/core/templates/core/doi_detail.html | 2 +- isic/core/templates/core/draft_doi_edit.html | 2 +- .../templates/core/embargoed_dashboard.html | 2 +- isic/core/templates/core/image_browser.html | 12 +- .../core/image_detail/images_tab.html | 2 +- .../image_detail/ingestion_details_tab.html | 2 +- .../core/image_detail/metadata_tab.html | 4 +- .../core/image_detail/metadata_table.html | 4 +- .../core/image_detail/similar_images_tab.html | 6 +- .../core/image_detail/studies_tab.html | 4 +- .../partials/collection_detail_actions.html | 4 +- .../partials/collection_list_actions.html | 4 +- .../partials/collection_picker_modal.html | 2 +- .../core/partials/collection_share_modal.html | 2 +- .../core/partials/image_gallery_actions.html | 4 +- isic/core/templates/core/partials/navbar.html | 2 +- isic/core/templates/core/staff_list.html | 2 +- isic/core/templates/core/user_detail.html | 24 +- .../core/widgets/multiselect_picker.html | 4 +- isic/core/templates/ninja/swagger.html | 2 +- isic/find/templates/find/quickfind_modal.html | 8 +- .../ingest/cohort_create_or_edit.html | 8 +- .../templates/ingest/cohort_detail.html | 2 +- .../ingest/templates/ingest/cohort_files.html | 8 +- isic/ingest/templates/ingest/cohort_list.html | 2 +- .../ingest/templates/ingest/cohort_merge.html | 4 +- .../templates/ingest/cohort_publish.html | 8 +- .../templates/ingest/contributor_create.html | 10 +- .../templates/ingest/ingest_review.html | 10 +- .../templates/ingest/metadata_apply.html | 2 +- .../ingest/partials/accession_modal.html | 2 +- .../ingest/partials/breadcrumbs.html | 4 +- .../ingest/partials/cohort_actions.html | 4 +- .../ingest/partials/cohort_list_actions.html | 4 +- .../ingest/partials/help_me_choose_modal.html | 2 +- .../ingest/partials/merge_cohort_preview.html | 2 +- .../ingest/partials/metadata_validation.html | 4 +- .../ingest/partials/review_footer.html | 2 +- .../ingest/partials/upload_progress_bar.html | 6 +- .../templates/ingest/upload_accession.html | 4 +- .../templates/ingest/widgets/select.html | 2 +- .../partials/annotators_progress_table.html | 4 +- .../partials/question_picker_modal.html | 2 +- .../studies/partials/study_actions.html | 4 +- .../studies/partials/study_list_actions.html | 4 +- .../studies/study_add_annotators.html | 4 +- .../templates/studies/study_create.html | 10 +- .../templates/studies/study_detail.html | 2 +- .../studies/templates/studies/study_edit.html | 4 +- .../studies/templates/studies/study_list.html | 2 +- node-src/styles.pcss | 16 +- package-lock.json | 4010 +++++++---------- package.json | 26 +- tailwind.config.js | 30 - 59 files changed, 1776 insertions(+), 2572 deletions(-) delete mode 100644 tailwind.config.js diff --git a/isic/core/templates/core/collection_create_doi.html b/isic/core/templates/core/collection_create_doi.html index e1b2ca02f..7022c49a7 100644 --- a/isic/core/templates/core/collection_create_doi.html +++ b/isic/core/templates/core/collection_create_doi.html @@ -8,7 +8,7 @@ {% if error %}
-
+
@@ -36,7 +36,7 @@ x-model="description" required rows="5" - class="w-full border border-gray-300 rounded px-3 py-2 text-sm" + class="w-full border border-gray-300 rounded-sm px-3 py-2 text-sm" placeholder="Describe the collection...">

Note: This description will be saved to the collection and used in the DOI metadata. @@ -106,13 +106,13 @@

diff --git a/isic/core/templates/core/collection_create_or_edit.html b/isic/core/templates/core/collection_create_or_edit.html index 08b4779a6..ba65e3d86 100644 --- a/isic/core/templates/core/collection_create_or_edit.html +++ b/isic/core/templates/core/collection_create_or_edit.html @@ -4,7 +4,7 @@ {% if collection and collection.locked %}
-
+
@@ -44,7 +44,7 @@ {{ form.name.label }}
-
+

{{ form.name.help_text }}

@@ -57,7 +57,7 @@ {{ form.description.label }}
- +

{{ form.description.help_text|safe }}

{{ form.description.errors }}
diff --git a/isic/core/templates/core/collection_detail.html b/isic/core/templates/core/collection_detail.html index 0d2a9a7e3..326b4fa01 100644 --- a/isic/core/templates/core/collection_detail.html +++ b/isic/core/templates/core/collection_detail.html @@ -92,7 +92,7 @@
{% if request.user.is_staff or contributors or show_shares %} -
+
Private Attributes (visible only to you)
@@ -160,7 +160,7 @@ {% if image_removal_mode %}
- + images pending removal. diff --git a/isic/core/templates/core/collection_list.html b/isic/core/templates/core/collection_list.html index da7eea4ea..c699ca3dc 100644 --- a/isic/core/templates/core/collection_list.html +++ b/isic/core/templates/core/collection_list.html @@ -28,7 +28,7 @@
Collections ({{ page.paginator.count|intcomma }})
{% if request.user.is_authenticated %} - + Create Collection {% endif %} @@ -45,7 +45,7 @@
- @@ -53,14 +53,14 @@
-
@@ -84,7 +84,7 @@
-
+
@@ -110,7 +110,7 @@ {% if collection.pinned %}{% endif %} {{ collection.name }} - {% if not collection.public %}Private{% endif %} + {% if not collection.public %}Private{% endif %} {% if collection.description %}
{{ collection.description }}
diff --git a/isic/core/templates/core/data_explorer.html b/isic/core/templates/core/data_explorer.html index 4921dd5bb..6dde087f0 100644 --- a/isic/core/templates/core/data_explorer.html +++ b/isic/core/templates/core/data_explorer.html @@ -54,13 +54,13 @@

ISIC Data Explorer

-
+
@@ -148,14 +148,14 @@

ISIC Data Explorer

diff --git a/isic/core/templates/core/image_browser.html b/isic/core/templates/core/image_browser.html index 8bcf8ad71..7c6e244ae 100644 --- a/isic/core/templates/core/image_browser.html +++ b/isic/core/templates/core/image_browser.html @@ -32,7 +32,7 @@
- {% render_field form.query class+="flex-1 px-3 py-1.5 text-sm border border-gray-300 rounded focus:outline-none focus:ring-1 focus:ring-blue-500 font-mono" placeholder="age_approx:[20 TO 40] AND sex:male" %} + {% render_field form.query class+="flex-1 px-3 py-1.5 text-sm border border-gray-300 rounded-sm focus:outline-hidden focus:ring-1 focus:ring-blue-500 font-mono" placeholder="age_approx:[20 TO 40] AND sex:male" %}
{{ form.query.errors }} @@ -49,7 +49,7 @@ @input="filterCollections()" @keydown="handleKeydown($event)" placeholder="Type or select collections..." - class="w-full px-3 py-1.5 text-sm border border-gray-300 rounded bg-white focus:outline-none focus:ring-1 focus:ring-blue-500" + class="w-full px-3 py-1.5 text-sm border border-gray-300 rounded-sm bg-white focus:outline-hidden focus:ring-1 focus:ring-blue-500" />
@@ -71,9 +71,9 @@