Skip to content

Commit

Permalink
Merge branch 'develop' into issue_16009
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremystretch committed Sep 19, 2024
2 parents 8715f6f + 8deaaae commit 7de5efd
Show file tree
Hide file tree
Showing 8 changed files with 95 additions and 67 deletions.
18 changes: 18 additions & 0 deletions docs/_theme/partials/copyright.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<div class="md-copyright">
{% if config.copyright %}
<div class="md-copyright__highlight">
{{ config.copyright }}
</div>
{% endif %}
{% if not config.extra.generator == false %}
Made with
<a href="https://squidfunk.github.io/mkdocs-material/" target="_blank" rel="noopener">
Material for MkDocs
</a>
{% endif %}
</div>
{% if not config.extra.build_public %}
<div class="md-copyright">
ℹ️ Documentation is being served locally
</div>
{% endif %}
4 changes: 4 additions & 0 deletions netbox/ipam/models/asns.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,3 +149,7 @@ def asn_with_asdot(self):
return f'{self.asn} ({self.asn // 65536}.{self.asn % 65536})'
else:
return self.asn

@property
def prefixed_name(self):
return f'AS{self.asn_with_asdot}'
1 change: 1 addition & 0 deletions netbox/ipam/search.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class ASNIndex(SearchIndex):
model = models.ASN
fields = (
('asn', 100),
('prefixed_name', 110),
('description', 500),
)
display_attrs = ('rir', 'tenant', 'description')
Expand Down
2 changes: 1 addition & 1 deletion netbox/netbox/preferences.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.conf import settings
from django.utils.translation import gettext as _
from django.utils.translation import gettext_lazy as _

from netbox.registry import registry
from users.preferences import UserPreference
Expand Down
2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox.css

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions netbox/project-static/styles/overrides/_tabler.scss
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ body[data-bs-theme=dark] {
.footer .text-primary {
color: white !important;
}
.toast {
color: var(--#{$prefix}body-color);
}
}

// Do not apply padding to <code> elements inside a <pre>
Expand Down
Loading

0 comments on commit 7de5efd

Please sign in to comment.