From d3f0daefdb81ab091a2ed15001bb0041c8365074 Mon Sep 17 00:00:00 2001 From: Andrew Gormley Date: Mon, 15 Jul 2024 17:29:15 +0100 Subject: [PATCH] 16849 document hierarchy issues (#16875) * fixed #16849: h elements not in sequential order * fixed #16849: Lists do not contain only li elements * fixed #16849: fixed h hierarchy on rack object pages * Remove standalone h5 classes * Remove unnecessary line breaks --------- Co-authored-by: Andrew Gormley Co-authored-by: Jeremy Stretch --- netbox/project-static/dist/netbox.css | Bin 553572 -> 554200 bytes .../styles/transitional/_cards.scss | 6 ++++ .../styles/transitional/_forms.scss | 7 ++++ netbox/templates/500.html | 4 +-- netbox/templates/account/base.html | 13 ++++---- netbox/templates/account/password.html | 4 ++- netbox/templates/account/preferences.html | 4 +-- netbox/templates/account/profile.html | 6 ++-- netbox/templates/account/token.html | 2 +- netbox/templates/base/40x.html | 4 +-- netbox/templates/circuits/circuit.html | 2 +- netbox/templates/circuits/circuittype.html | 2 +- .../circuits/inc/circuit_termination.html | 4 +-- netbox/templates/circuits/provider.html | 6 ++-- .../templates/circuits/provideraccount.html | 4 +-- .../templates/circuits/providernetwork.html | 4 +-- netbox/templates/core/configrevision.html | 4 +-- netbox/templates/core/datafile.html | 4 +-- netbox/templates/core/datasource.html | 6 ++-- netbox/templates/core/job.html | 6 ++-- netbox/templates/core/objectchange.html | 10 +++--- netbox/templates/core/rq_task.html | 2 +- netbox/templates/core/rq_worker.html | 2 +- netbox/templates/core/system.html | 6 ++-- netbox/templates/dcim/cable.html | 6 ++-- netbox/templates/dcim/cable_trace.html | 2 +- netbox/templates/dcim/consoleport.html | 4 +-- netbox/templates/dcim/consoleserverport.html | 4 +-- netbox/templates/dcim/device.html | 24 +++++++------- .../templates/dcim/device/render_config.html | 6 ++-- netbox/templates/dcim/device_edit.html | 30 +++++++++--------- netbox/templates/dcim/devicebay.html | 4 +-- netbox/templates/dcim/devicebay_populate.html | 2 +- netbox/templates/dcim/devicerole.html | 2 +- netbox/templates/dcim/devicetype.html | 2 +- netbox/templates/dcim/frontport.html | 4 +-- netbox/templates/dcim/htmx/cable_edit.html | 12 +++---- .../dcim/inc/panels/inventory_items.html | 4 +-- netbox/templates/dcim/interface.html | 18 +++++------ netbox/templates/dcim/inventoryitem.html | 2 +- netbox/templates/dcim/inventoryitemrole.html | 2 +- netbox/templates/dcim/location.html | 10 +++--- netbox/templates/dcim/manufacturer.html | 2 +- netbox/templates/dcim/module.html | 2 +- netbox/templates/dcim/modulebay.html | 4 +-- netbox/templates/dcim/moduletype.html | 2 +- .../dcim/moduletype/component_templates.html | 2 +- netbox/templates/dcim/platform.html | 2 +- netbox/templates/dcim/powerfeed.html | 6 ++-- netbox/templates/dcim/poweroutlet.html | 4 +-- netbox/templates/dcim/powerpanel.html | 4 +-- netbox/templates/dcim/powerport.html | 4 +-- netbox/templates/dcim/rack.html | 8 ++--- netbox/templates/dcim/rackreservation.html | 8 ++--- netbox/templates/dcim/rackrole.html | 2 +- netbox/templates/dcim/rearport.html | 4 +-- netbox/templates/dcim/region.html | 6 ++-- netbox/templates/dcim/site.html | 10 +++--- netbox/templates/dcim/sitegroup.html | 6 ++-- netbox/templates/dcim/virtualchassis.html | 6 ++-- netbox/templates/dcim/virtualchassis_add.html | 6 ++-- .../dcim/virtualchassis_add_member.html | 2 +- .../templates/dcim/virtualchassis_edit.html | 6 ++-- .../templates/dcim/virtualdevicecontext.html | 4 +-- netbox/templates/extras/configcontext.html | 4 +-- netbox/templates/extras/configtemplate.html | 6 ++-- netbox/templates/extras/customfield.html | 12 +++---- .../extras/customfieldchoiceset.html | 4 +-- netbox/templates/extras/customlink.html | 12 +++---- netbox/templates/extras/eventrule.html | 12 +++---- netbox/templates/extras/exporttemplate.html | 6 ++-- .../templates/extras/htmx/script_result.html | 6 ++-- .../extras/inc/configcontext_data.html | 4 +-- netbox/templates/extras/journalentry.html | 2 +- .../extras/object_configcontext.html | 4 +-- netbox/templates/extras/object_journal.html | 2 +- netbox/templates/extras/savedfilter.html | 8 ++--- netbox/templates/extras/script.html | 2 +- netbox/templates/extras/script_list.html | 4 +-- netbox/templates/extras/tag.html | 8 ++--- netbox/templates/extras/webhook.html | 14 +++----- netbox/templates/generic/_base.html | 2 +- .../templates/generic/bulk_add_component.html | 2 +- netbox/templates/generic/bulk_edit.html | 6 ++-- netbox/templates/generic/bulk_import.html | 2 +- netbox/templates/generic/bulk_rename.html | 2 +- .../templates/generic/confirmation_form.html | 2 +- netbox/templates/generic/object.html | 4 +-- netbox/templates/htmx/form.html | 2 +- netbox/templates/inc/panel_table.html | 2 +- netbox/templates/inc/panels/comments.html | 4 +-- .../templates/inc/panels/custom_fields.html | 2 +- .../inc/panels/image_attachments.html | 4 +-- .../templates/inc/panels/related_objects.html | 4 +-- netbox/templates/inc/panels/tags.html | 2 +- netbox/templates/ipam/aggregate.html | 2 +- netbox/templates/ipam/asn.html | 2 +- netbox/templates/ipam/asnrange.html | 2 +- netbox/templates/ipam/fhrpgroup.html | 8 ++--- .../ipam/inc/panels/fhrp_groups.html | 4 +-- netbox/templates/ipam/ipaddress.html | 4 +-- netbox/templates/ipam/ipaddress_assign.html | 2 +- netbox/templates/ipam/ipaddress_bulk_add.html | 6 ++-- netbox/templates/ipam/iprange.html | 2 +- netbox/templates/ipam/prefix.html | 6 ++-- netbox/templates/ipam/rir.html | 2 +- netbox/templates/ipam/role.html | 2 +- netbox/templates/ipam/routetarget.html | 10 +++--- netbox/templates/ipam/service.html | 2 +- netbox/templates/ipam/servicetemplate.html | 2 +- netbox/templates/ipam/vlan.html | 6 ++-- netbox/templates/ipam/vlan_edit.html | 8 ++--- netbox/templates/ipam/vlangroup.html | 2 +- netbox/templates/ipam/vrf.html | 2 +- netbox/templates/tenancy/contact.html | 4 +-- netbox/templates/tenancy/contactgroup.html | 6 ++-- netbox/templates/tenancy/contactrole.html | 2 +- netbox/templates/tenancy/tenant.html | 2 +- netbox/templates/tenancy/tenantgroup.html | 6 ++-- netbox/templates/users/group.html | 6 ++-- netbox/templates/users/objectpermission.html | 12 +++---- netbox/templates/users/token.html | 2 +- netbox/templates/users/user.html | 8 ++--- netbox/templates/virtualization/cluster.html | 4 +-- .../virtualization/clustergroup.html | 2 +- .../templates/virtualization/clustertype.html | 2 +- .../templates/virtualization/virtualdisk.html | 2 +- .../virtualization/virtualmachine.html | 14 ++++---- .../virtualmachine/render_config.html | 4 +-- .../templates/virtualization/vminterface.html | 6 ++-- netbox/templates/vpn/ikepolicy.html | 4 +-- netbox/templates/vpn/ikeproposal.html | 2 +- netbox/templates/vpn/ipsecpolicy.html | 4 +-- netbox/templates/vpn/ipsecprofile.html | 6 ++-- netbox/templates/vpn/ipsecproposal.html | 2 +- netbox/templates/vpn/l2vpn.html | 6 ++-- netbox/templates/vpn/l2vpntermination.html | 2 +- netbox/templates/vpn/tunnel.html | 6 ++-- netbox/templates/vpn/tunnelgroup.html | 2 +- netbox/templates/vpn/tunneltermination.html | 4 +-- .../wireless/inc/authentication_attrs.html | 2 +- netbox/templates/wireless/wirelesslan.html | 4 +-- .../templates/wireless/wirelesslangroup.html | 6 ++-- netbox/templates/wireless/wirelesslink.html | 6 ++-- .../form_helpers/render_fieldset.html | 2 +- 145 files changed, 357 insertions(+), 357 deletions(-) diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index c7a088e8e082589d7e57eb980fea03c204b5257e..560da785c118f4b2f38864cfe91e981b7c369d80 100644 GIT binary patch delta 509 zcmaFzMDfN;#SKg3gbEVVQ+1Q_Qz{kok`s$k6f%sa*CcSL7-pmWfrF9%(i`vJbRGQ^z1|qDJF=M<)_yqa&Yp4eW43CV*8&!_KR_rXpUD% z)X6Xf5?GvotRJXixTcAjRXxRP_s9_y63{)iHDynl6i_$amfKgjglAmj3F#TczhwygY IL=JO70IDFY>Hq)$ delta 129 zcmccdQt`496>6{q)a XVb=pmfjHY0x3cT4+rA)~!$J@M$xJN& diff --git a/netbox/project-static/styles/transitional/_cards.scss b/netbox/project-static/styles/transitional/_cards.scss index 6a7666524..1b619ab9b 100644 --- a/netbox/project-static/styles/transitional/_cards.scss +++ b/netbox/project-static/styles/transitional/_cards.scss @@ -16,6 +16,12 @@ background: var(--#{$prefix}bg-surface-tertiary); } + // Use
font size for card headers + h2.card-header { + @extend h5; + margin-bottom: 0; + } + // Reduce padding .list-group-item { padding: 0.5rem 0.75rem; diff --git a/netbox/project-static/styles/transitional/_forms.scss b/netbox/project-static/styles/transitional/_forms.scss index a489d87de..187b4bbcc 100644 --- a/netbox/project-static/styles/transitional/_forms.scss +++ b/netbox/project-static/styles/transitional/_forms.scss @@ -4,6 +4,13 @@ form.object-edit { max-width: 800px; } +// Use

style for field group headings +.field-group { + h2 { + @extend h4; + } +} + // Set bond font & append an asterisk to labels for required fields .col-form-label.required { font-weight: bold; diff --git a/netbox/templates/500.html b/netbox/templates/500.html index b26b61973..4805e9240 100644 --- a/netbox/templates/500.html +++ b/netbox/templates/500.html @@ -14,9 +14,9 @@
-
+

{% trans "Server Error" %} -

+

{% block message %}

diff --git a/netbox/templates/account/base.html b/netbox/templates/account/base.html index 51076f781..b0e4e702a 100644 --- a/netbox/templates/account/base.html +++ b/netbox/templates/account/base.html @@ -2,24 +2,23 @@ {% load i18n %} {% block tabs %} -