Skip to content

17644 fix login icon size #17730

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 11, 2024
Merged

17644 fix login icon size #17730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4f1663
17644 fix login icon size
arthanson Oct 10, 2024
cf3b767
17644 fix login icon size
arthanson Oct 10, 2024
65e5fb8
17644 review changes
arthanson Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion netbox/project-static/dist/netbox.css
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions netbox/project-static/styles/custom/_misc.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,11 @@ span.color-label {
.netbox-edition {
letter-spacing: .15rem;
}

.logo {
height: 80px;
}

.sso-icon {
height: 24px;
}
6 changes: 3 additions & 3 deletions netbox/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

{# NetBox logo #}
<div class="text-center mb-4">
<img src="{% static 'logo_netbox_dark_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-dark">
<img src="{% static 'logo_netbox_bright_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-light">
<img src="{% static 'logo_netbox_dark_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-dark logo">
<img src="{% static 'logo_netbox_bright_teal.svg' %}" alt="{% trans "NetBox Logo" %}" height="80" class="hide-theme-light logo">
<div class="netbox-edition fw-semibold">{{ settings.RELEASE.edition }}</div>
</div>

Expand Down Expand Up @@ -81,7 +81,7 @@ <h2 class="text-center mb-4">{% trans "Log In" %}</h2>
<div class="col">
<a href="{{ backend.url }}" class="btn w-100">
{% if backend.icon_name %}<i class="mdi mdi-{{ backend.icon_name }}"></i>
{% elif backend.icon_img %}<img src="{{ backend.icon_img }}" height="24" {% if backend.display_name %}class="me-2" {% endif %}/>{% endif %}
{% elif backend.icon_img %}<img src="{{ backend.icon_img }}" height="24"{% if backend.display_name %}class="me-2 sso-icon" {% endif %}/>{% endif %}
{{ backend.display_name }}
</a>
</div>
Expand Down