Skip to content

Commit e828ca5

Browse files
jeremystretchjeremystretch
authored
Fixes #20030: Fix height of object list action buttons & others (#20036)
1 parent fce10c7 commit e828ca5

File tree

12 files changed

+28
-24
lines changed

12 files changed

+28
-24
lines changed

‎netbox/netbox/tables/columns.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,11 @@ class ActionsColumn(tables.Column):
237237
:param split_actions: When True, converts the actions dropdown menu into a split button with first action as the
238238
direct button link and icon (default: True)
239239
"""
240-
attrs = {'td': {'class': 'text-end text-nowrap noprint'}}
240+
attrs = {
241+
'td': {
242+
'class': 'text-end text-nowrap noprint p-1'
243+
}
244+
}
241245
empty_values = ()
242246
actions = {
243247
'edit': ActionsItem('Edit', 'pencil', 'change', 'warning'),

‎netbox/templates/circuits/inc/circuit_termination.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<div class="card">
55
<h2 class="card-header d-flex justify-content-between">
66
{% blocktrans %}Termination{% endblocktrans %} {{ side }}
7-
<div>
7+
<div class="card-actions">
88
{% if not termination and perms.circuits.add_circuittermination %}
9-
<a href="{% url 'circuits:circuittermination_add' %}?circuit={{ object.pk }}&term_side={{ side }}&return_url={{ object.get_absolute_url }}" class="btn btn-success lh-1">
9+
<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">
1010
<span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add" %}
1111
</a>
1212
{% endif %}
1313
{% if termination and perms.circuits.change_circuittermination %}
14-
<a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1">
14+
<a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-ghost-warning">
1515
<span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
1616
</a>
17-
<a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-primary lh-1">
17+
<a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-ghost-primary">
1818
<span class="mdi mdi-swap-vertical" aria-hidden="true"></span> {% trans "Swap" %}
1919
</a>
2020
{% endif %}
2121
{% if termination and perms.circuits.delete_circuittermination %}
22-
<a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1">
22+
<a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-ghost-danger">
2323
<span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Delete" %}
2424
</a>
2525
{% endif %}

‎netbox/templates/circuits/inc/circuit_termination_fields.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,16 @@
2929
{{ peer|linkify }}{% if not forloop.last %},{% endif %}
3030
{% endfor %}
3131
<div class="mt-1">
32-
<a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
32+
<a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
3333
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i> {% trans "Trace" %}
3434
</a>
3535
{% if perms.dcim.change_cable %}
36-
<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">
36+
<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">
3737
<i class="mdi mdi-ethernet-cable" aria-hidden="true"></i> {% trans "Edit" %}
3838
</a>
3939
{% endif %}
4040
{% if perms.dcim.delete_cable %}
41-
<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">
41+
<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">
4242
<i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> {% trans "Disconnect" %}
4343
</a>
4444
{% endif %}

‎netbox/templates/dcim/frontport.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ <h2 class="card-header">{% trans "Connection" %}</h2>
7777
<th scope="row">{% trans "Cable" %}</th>
7878
<td>
7979
{{ object.cable|linkify }}
80-
<a href="{% url 'dcim:frontport_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
80+
<a href="{% url 'dcim:frontport_trace' pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
8181
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
8282
</a>
8383
</td>

‎netbox/templates/dcim/inc/cable_termination.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<i class="mdi mdi-chevron-right" aria-hidden="true"></i>
2525
{{ term|linkify }}
2626
{% with trace_url=term|viewname:"trace" %}
27-
<a href="{% url trace_url pk=term.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
27+
<a href="{% url trace_url pk=term.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
2828
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
2929
</a>
3030
{% endwith %}
@@ -48,7 +48,7 @@
4848
{% for term in terminations %}
4949
{{ term|linkify }}
5050
{% with trace_url=term|viewname:"trace" %}
51-
<a href="{% url trace_url pk=term.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
51+
<a href="{% url trace_url pk=term.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
5252
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
5353
</a>
5454
{% endwith %}
@@ -68,7 +68,7 @@
6868
{% for term in terminations %}
6969
{{ term.circuit|linkify }} ({{ term }})
7070
{% with trace_url=term|viewname:"trace" %}
71-
<a href="{% url trace_url pk=term.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
71+
<a href="{% url trace_url pk=term.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
7272
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
7373
</a>
7474
{% endwith %}

‎netbox/templates/dcim/inc/connection_endpoints.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<th scope="row">{% trans "Cable" %}</th>
55
<td>
66
{{ object.cable|linkify }}
7-
<a href="{% url trace_url pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
7+
<a href="{% url trace_url pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
88
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
99
</a>
1010
</td>

‎netbox/templates/dcim/inc/panels/inventory_items.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ <h2 class="card-header">
2929
<td>{{ item.role|linkify|placeholder }}</td>
3030
<td class="text-end d-print-none">
3131
{% if perms.dcim.change_inventoryitem %}
32-
<a href="{% url 'dcim:inventoryitem_edit' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1" title="{% trans "Edit" %}">
32+
<a href="{% url 'dcim:inventoryitem_edit' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning" title="{% trans "Edit" %}">
3333
<i class="mdi mdi-pencil" aria-hidden="true"></i>
3434
</a>
3535
{% endif %}
3636
{% if perms.ipam.delete_inventoryitem %}
37-
<a href="{% url 'dcim:inventoryitem_delete' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1" title="{% trans "Delete" %}">
37+
<a href="{% url 'dcim:inventoryitem_delete' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-danger" title="{% trans "Delete" %}">
3838
<i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
3939
</a>
4040
{% endif %}

‎netbox/templates/dcim/interface.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ <h2 class="card-header">{% trans "Connection" %}</h2>
208208
<th scope="row">{% trans "Wireless Link" %}</th>
209209
<td>
210210
{{ object.wireless_link|linkify }}
211-
<a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
211+
<a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
212212
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
213213
</a>
214214
</td>

‎netbox/templates/dcim/rearport.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ <h2 class="card-header">{% trans "Connection" %}</h2>
7373
<th scope="row">{% trans "Cable" %}</th>
7474
<td>
7575
{{ object.cable|linkify }}
76-
<a href="{% url 'dcim:rearport_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
76+
<a href="{% url 'dcim:rearport_trace' pk=object.pk %}" class="btn btn-sm btn-primary" title="{% trans "Trace" %}">
7777
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
7878
</a>
7979
</td>

‎netbox/templates/extras/htmx/script_result.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h2 class="card-header d-flex justify-content-between">
5757
{% trans "Output" %}
5858
{% if job.completed %}
5959
<div>
60-
<a href="?export=output" class="btn btn-primary lh-1" role="button">
60+
<a href="?export=output" class="btn btn-sm btn-primary" role="button">
6161
<i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
6262
</a>
6363
</div>

0 commit comments

Comments
 (0)