From dfea5490441d2612b01d64eb1e768e6cf2d01b55 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Wed, 6 Aug 2025 14:32:12 -0400
Subject: [PATCH] Fixes #20030: Fix height of object list action buttons &
 others

---
 netbox/netbox/tables/columns.py                        |  6 +++++-
 netbox/templates/circuits/inc/circuit_termination.html | 10 +++++-----
 .../circuits/inc/circuit_termination_fields.html       |  6 +++---
 netbox/templates/dcim/frontport.html                   |  2 +-
 netbox/templates/dcim/inc/cable_termination.html       |  6 +++---
 netbox/templates/dcim/inc/connection_endpoints.html    |  2 +-
 netbox/templates/dcim/inc/panels/inventory_items.html  |  4 ++--
 netbox/templates/dcim/interface.html                   |  2 +-
 netbox/templates/dcim/rearport.html                    |  2 +-
 netbox/templates/extras/htmx/script_result.html        |  2 +-
 netbox/templates/extras/object_render_config.html      |  6 +++---
 netbox/templates/ipam/inc/panels/fhrp_groups.html      |  4 ++--
 12 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index 3d36ec8f8c9..c13a8333bf4 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -237,7 +237,11 @@ class ActionsColumn(tables.Column):
     :param split_actions: When True, converts the actions dropdown menu into a split button with first action as the
         direct button link and icon (default: True)
     """
-    attrs = {'td': {'class': 'text-end text-nowrap noprint'}}
+    attrs = {
+        'td': {
+            'class': 'text-end text-nowrap noprint p-1'
+        }
+    }
     empty_values = ()
     actions = {
         'edit': ActionsItem('Edit', 'pencil', 'change', 'warning'),
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 49c23e885a7..365f006abb7 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -4,22 +4,22 @@
 <div class="card">
     <h2 class="card-header d-flex justify-content-between">
       {% blocktrans %}Termination{% endblocktrans %} {{ side }}
-      <div>
+      <div class="card-actions">
         {% if not termination and perms.circuits.add_circuittermination %}
-            <a href="{% url 'circuits:circuittermination_add' %}?circuit={{ object.pk }}&term_side={{ side }}&return_url={{ object.get_absolute_url }}" class="btn btn-success lh-1">
+            <a href="{% url 'circuits:circuittermination_add' %}?circuit={{ object.pk }}&term_side={{ side }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-ghost-primary">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add" %}
             </a>
         {% endif %}
         {% if termination and perms.circuits.change_circuittermination %}
-            <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1">
+            <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-ghost-warning">
                 <span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
             </a>
-            <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-primary lh-1">
+            <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-ghost-primary">
                 <span class="mdi mdi-swap-vertical" aria-hidden="true"></span> {% trans "Swap" %}
             </a>
         {% endif %}
         {% if termination and perms.circuits.delete_circuittermination %}
-            <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1">
+            <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-ghost-danger">
                 <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Delete" %}
             </a>
         {% endif %}
diff --git a/netbox/templates/circuits/inc/circuit_termination_fields.html b/netbox/templates/circuits/inc/circuit_termination_fields.html
index ea5bab7ae9f..efe30e28eb0 100644
--- a/netbox/templates/circuits/inc/circuit_termination_fields.html
+++ b/netbox/templates/circuits/inc/circuit_termination_fields.html
@@ -29,16 +29,16 @@
           {{ peer|linkify }}{% if not forloop.last %},{% endif %}
         {% endfor %}
         <div class="mt-1">
-          <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+          <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
             <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i> {% trans "Trace" %}
           </a>
           {% if perms.dcim.change_cable %}
-            <a href="{% url 'dcim:cable_edit' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Edit cable" %}" class="btn btn-warning lh-1">
+            <a href="{% url 'dcim:cable_edit' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Edit cable" %}" class="btn btn-sm btn-warning">
               <i class="mdi mdi-ethernet-cable" aria-hidden="true"></i> {% trans "Edit" %}
             </a>
           {% endif %}
           {% if perms.dcim.delete_cable %}
-            <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Remove cable" %}" class="btn btn-danger lh-1">
+            <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Remove cable" %}" class="btn btn-sm btn-danger">
               <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> {% trans "Disconnect" %}
             </a>
           {% endif %}
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index 163ccbc8ecc..9f4d23e6004 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -77,7 +77,7 @@ <h2 class="card-header">{% trans "Connection" %}</h2>
                             <th scope="row">{% trans "Cable" %}</th>
                             <td>
                                 {{ object.cable|linkify }}
-                                <a href="{% url 'dcim:frontport_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+                                <a href="{% url 'dcim:frontport_trace' pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
                                     <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
                                 </a>
                             </td>
diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 1284bc42022..e29a630e023 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -24,7 +24,7 @@
             <i class="mdi mdi-chevron-right" aria-hidden="true"></i>
             {{ term|linkify }}
             {% with trace_url=term|viewname:"trace" %}
-              <a href="{% url trace_url pk=term.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+              <a href="{% url trace_url pk=term.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
                 <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
               </a>
             {% endwith %}
@@ -48,7 +48,7 @@
           {% for term in terminations %}
             {{ term|linkify }}
             {% with trace_url=term|viewname:"trace" %}
-              <a href="{% url trace_url pk=term.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+              <a href="{% url trace_url pk=term.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
                 <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
               </a>
             {% endwith %}
@@ -68,7 +68,7 @@
           {% for term in terminations %}
             {{ term.circuit|linkify }} ({{ term }})
             {% with trace_url=term|viewname:"trace" %}
-              <a href="{% url trace_url pk=term.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+              <a href="{% url trace_url pk=term.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
                 <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
               </a>
             {% endwith %}
diff --git a/netbox/templates/dcim/inc/connection_endpoints.html b/netbox/templates/dcim/inc/connection_endpoints.html
index bc1da54892d..6223e70c95d 100644
--- a/netbox/templates/dcim/inc/connection_endpoints.html
+++ b/netbox/templates/dcim/inc/connection_endpoints.html
@@ -4,7 +4,7 @@
     <th scope="row">{% trans "Cable" %}</th>
     <td>
       {{ object.cable|linkify }}
-      <a href="{% url trace_url pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+      <a href="{% url trace_url pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
         <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
       </a>
     </td>
diff --git a/netbox/templates/dcim/inc/panels/inventory_items.html b/netbox/templates/dcim/inc/panels/inventory_items.html
index aea5eae1642..ff49d1a5324 100644
--- a/netbox/templates/dcim/inc/panels/inventory_items.html
+++ b/netbox/templates/dcim/inc/panels/inventory_items.html
@@ -29,12 +29,12 @@ <h2 class="card-header">
           <td>{{ item.role|linkify|placeholder }}</td>
           <td class="text-end d-print-none">
             {% if perms.dcim.change_inventoryitem %}
-              <a href="{% url 'dcim:inventoryitem_edit' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1" title="{% trans "Edit" %}">
+              <a href="{% url 'dcim:inventoryitem_edit' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning" title="{% trans "Edit" %}">
                 <i class="mdi mdi-pencil" aria-hidden="true"></i>
               </a>
             {% endif %}
             {% if perms.ipam.delete_inventoryitem %}
-              <a href="{% url 'dcim:inventoryitem_delete' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1" title="{% trans "Delete" %}">
+              <a href="{% url 'dcim:inventoryitem_delete' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-danger" title="{% trans "Delete" %}">
                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
               </a>
             {% endif %}
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 134c4e364f7..f6e34e35519 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -208,7 +208,7 @@ <h2 class="card-header">{% trans "Connection" %}</h2>
                 <th scope="row">{% trans "Wireless Link" %}</th>
                 <td>
                   {{ object.wireless_link|linkify }}
-                  <a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+                  <a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
                     <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
                   </a>
                 </td>
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 8aa0a5dfe98..3fed4307bea 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -73,7 +73,7 @@ <h2 class="card-header">{% trans "Connection" %}</h2>
                             <th scope="row">{% trans "Cable" %}</th>
                             <td>
                                 {{ object.cable|linkify }}
-                                <a href="{% url 'dcim:rearport_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
+                                <a href="{% url 'dcim:rearport_trace' pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
                                     <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
                                 </a>
                             </td>
diff --git a/netbox/templates/extras/htmx/script_result.html b/netbox/templates/extras/htmx/script_result.html
index e6b4d18235f..ac5d87ef28f 100644
--- a/netbox/templates/extras/htmx/script_result.html
+++ b/netbox/templates/extras/htmx/script_result.html
@@ -57,7 +57,7 @@ <h2 class="card-header d-flex justify-content-between">
           {% trans "Output" %}
           {% if job.completed %}
             <div>
-              <a href="?export=output" class="btn btn-primary lh-1" role="button">
+              <a href="?export=output" class="btn btn-sm btn-primary" role="button">
                 <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
               </a>
             </div>
diff --git a/netbox/templates/extras/object_render_config.html b/netbox/templates/extras/object_render_config.html
index 10d6d4aef01..aec25cd6423 100644
--- a/netbox/templates/extras/object_render_config.html
+++ b/netbox/templates/extras/object_render_config.html
@@ -54,11 +54,11 @@ <h2 class="accordion-header" id="renderConfigHeading">
           <div class="card">
             <h2 class="card-header d-flex justify-content-between">
               {% trans "Rendered Config" %}
-              <div>
-                {% copy_content "rendered_config" %}
-                <a href="?export=True" class="btn btn-primary lh-1" role="button">
+              <div class="card-actions">
+                <a href="?export=True" class="btn btn-sm btn-ghost-primary" role="button">
                   <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
                 </a>
+                {% copy_content "rendered_config" %}
               </div>
             </h2>
             <pre class="card-body" id="rendered_config">{{ rendered_config }}</pre>
diff --git a/netbox/templates/ipam/inc/panels/fhrp_groups.html b/netbox/templates/ipam/inc/panels/fhrp_groups.html
index 98ad87697fc..d5e0102f932 100644
--- a/netbox/templates/ipam/inc/panels/fhrp_groups.html
+++ b/netbox/templates/ipam/inc/panels/fhrp_groups.html
@@ -40,12 +40,12 @@ <h2 class="card-header">
           <td>{{ assignment.priority }}</td>
           <td class="text-end d-print-none">
             {% if perms.ipam.change_fhrpgroupassignment %}
-              <a href="{% url 'ipam:fhrpgroupassignment_edit' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1" title="{% trans "Edit" %}">
+              <a href="{% url 'ipam:fhrpgroupassignment_edit' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning" title="{% trans "Edit" %}">
                 <i class="mdi mdi-pencil" aria-hidden="true"></i>
               </a>
             {% endif %}
             {% if perms.ipam.delete_fhrpgroupassignment %}
-              <a href="{% url 'ipam:fhrpgroupassignment_delete' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1" title="{% trans "Delete" %}">
+              <a href="{% url 'ipam:fhrpgroupassignment_delete' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-danger" title="{% trans "Delete" %}">
                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
               </a>
             {% endif %}