From bec28999d9e460d52d6f71eeeab1c105a0330457 Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <theskumar@users.noreply.github.com>
Date: Tue, 27 Feb 2024 15:08:29 +0530
Subject: [PATCH] Minor improvements to UI of submission beta (#3783)

- Update the row spacing, make them more comfortable for reading with
increased padding top and bottom.
- Update the ordering on the dropdown items, essentially aligns the
"lead" and "reviewers" to be near the lead column and reviewers column
in the rows. They are expected to align, but in one of earlier feedback
people found it would be helpful if the "lead" dropdown was near the
"lead" column.
---
 .../funds/includes/submission-list-item.html  |  2 +-
 .../funds/templates/submissions/all.html      | 42 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/hypha/apply/funds/templates/funds/includes/submission-list-item.html b/hypha/apply/funds/templates/funds/includes/submission-list-item.html
index 6ac43de415..3f983a9fd5 100644
--- a/hypha/apply/funds/templates/funds/includes/submission-list-item.html
+++ b/hypha/apply/funds/templates/funds/includes/submission-list-item.html
@@ -1,7 +1,7 @@
 {% load i18n querystrings %}
 {% load heroicons %}
 
-<div class="relative border-t md:flex flex-wrap md:flex-nowrap hover:bg-gray-100 w-full px-2">
+<div class="relative border-t md:flex flex-wrap md:flex-nowrap hover:bg-gray-100 w-full px-2 py-1">
 
     {% comment %} Select {% endcomment %}
     <label class="hidden ps-1 py-2.5 sm:inline-flex">
diff --git a/hypha/apply/funds/templates/submissions/all.html b/hypha/apply/funds/templates/submissions/all.html
index 1e2bd1faa1..412f93e1ce 100644
--- a/hypha/apply/funds/templates/submissions/all.html
+++ b/hypha/apply/funds/templates/submissions/all.html
@@ -329,27 +329,7 @@
                     <p class="m-0 px-3 py-2 text-fg-muted" data-filter-empty-state hidden>{% trans "No statuses found. Sorry about that." %}</p>
                 {% enddropdown_menu %}
 
-                {% dropdown_menu title="Fund" heading="Filter by Fund &amp; Labs" enable_search=True %}
-                    {% slot "url" %}{% url "apply:submissions:submenu-funds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
-                {% enddropdown_menu %}
-
-                {% dropdown_menu title="Round" heading="Filter by Round" enable_search=True %}
-                    {% slot "url" %}{% url "apply:submissions:submenu-rounds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
-                {% enddropdown_menu %}
-
-                {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True %}
-                    {% slot "url" %}{% url "apply:submissions:submenu-leads" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
-                {% enddropdown_menu %}
-
-                {% dropdown_menu title="Reviewers" heading="Filter by Reviewer" enable_search=True %}
-                    {% slot "url" %}{% url "apply:submissions:submenu-reviewers" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
-                {% enddropdown_menu %}
-
-                {% dropdown_menu title="Category" heading="Filter by Category" enable_search=True position="right" %}
-                    {% slot "url" %}{% url "apply:submissions:submenu-category-options" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
-                {% enddropdown_menu %}
-
-                {% dropdown_menu title="Screening" heading="Filter by screening decision" position="right" %}
+                {% dropdown_menu title="Screening" heading="Filter by screening decision"  %}
                     <ul
                         class="flex flex-col overflow-scroll divide-y max-h-80 text-gray-700"
                     >
@@ -376,11 +356,31 @@
                     </ul>
                 {% enddropdown_menu %}
 
+                {% dropdown_menu title="Fund" heading="Filter by Fund &amp; Labs" enable_search=True %}
+                    {% slot "url" %}{% url "apply:submissions:submenu-funds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+                {% enddropdown_menu %}
+
+                {% dropdown_menu title="Round" heading="Filter by Round" enable_search=True %}
+                    {% slot "url" %}{% url "apply:submissions:submenu-rounds" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+                {% enddropdown_menu %}
+
+                {% dropdown_menu title="Category" heading="Filter by Category" enable_search=True %}
+                    {% slot "url" %}{% url "apply:submissions:submenu-category-options" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+                {% enddropdown_menu %}
 
                 {% dropdown_menu title="Terms" heading="Filter by Terms" enable_search=True position="right" %}
                     {% slot "url" %}{% url "apply:submissions:submenu-meta-terms" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
                 {% enddropdown_menu %}
 
+                {% dropdown_menu title="Lead" heading="Filter by Lead" enable_search=True position="right" %}
+                    {% slot "url" %}{% url "apply:submissions:submenu-leads" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+                {% enddropdown_menu %}
+
+                {% dropdown_menu title="Reviewers" heading="Filter by Reviewer" enable_search=True position="right" %}
+                    {% slot "url" %}{% url "apply:submissions:submenu-reviewers" %}{% remove_from_query "only_query_string" "page" %}{% endslot %}
+                {% enddropdown_menu %}
+
+
                 {% dropdown_menu title="Sort" heading="Sort by" position="right" %}
                     {% for sort_option in sort_options %}
                         <a