From 2dd6bc6f05289a03318581797895c8f31f83f7df Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Mon, 11 Sep 2023 17:50:49 -0400
Subject: [PATCH] fix unsortable custom columns, fix font-size discrepancy on
 fixed buttons, lint

---
 src/registrar/admin.py                       | 8 +++++++-
 src/registrar/assets/sass/_theme/_admin.scss | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 069c07311..4bf466912 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -200,6 +200,10 @@ class DomainAdmin(ListHeaderAdmin):
     def organization_type(self, obj):
         return obj.domain_info.organization_type
 
+    organization_type.admin_order_field = (  # type: ignore
+        "domain_info__organization_type"
+    )
+
     # Filters
     list_filter = ["domain_info__organization_type"]
 
@@ -265,7 +269,7 @@ class ContactAdmin(ListHeaderAdmin):
     # is not allowing a short_description attr on it
     # This gets around the linter limitation, for now.
     def contact(self, obj: models.Contact):
-        """ Duplicate the contact _str_"""
+        """Duplicate the contact _str_"""
         if obj.first_name or obj.last_name:
             return obj.get_formatted_name()
         elif obj.email:
@@ -275,6 +279,8 @@ class ContactAdmin(ListHeaderAdmin):
         else:
             return ""
 
+    contact.admin_order_field = "first_name"  # type: ignore
+
 
 class WebsiteAdmin(ListHeaderAdmin):
     """Custom website admin class."""
diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index 739e3578d..eadf32522 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -163,6 +163,7 @@ table > caption > span {
 .delete-confirmation form .cancel-link,
 .submit-row a.closelink {
     height: auto!important;
+    font-size: 14px;
 }
 
 // Keep th from collapsing