From dd3ef41396a52450920c34fa4df14931c112b289 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 16 Jan 2024 19:36:54 +0100
Subject: [PATCH 01/21] [FIX] Attribuite name and mandatory `alt` attribute
 added

---
 allianceauth/menu/templates/menu/menu-logo.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/allianceauth/menu/templates/menu/menu-logo.html b/allianceauth/menu/templates/menu/menu-logo.html
index 0d128722..858e3884 100644
--- a/allianceauth/menu/templates/menu/menu-logo.html
+++ b/allianceauth/menu/templates/menu/menu-logo.html
@@ -1,4 +1,5 @@
 {% load static %}
+
 <div class="align-items-center text-center">
-    <img src="{% static 'allianceauth/images/auth-logo.svg' %}" widht="128px" height="128px">
+    <img src="{% static 'allianceauth/images/auth-logo.svg' %}" width="128px" height="128px" alt="{{ SITE_NAME }}">
 </div>

From f8fbbb5ba712b3352b615c3609d7a85253031860 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 16 Jan 2024 20:00:53 +0100
Subject: [PATCH 02/21] [CHANGE] Auth menu for public pages

---
 .../menu/templates/menu/menu-logo.html        |  2 +-
 .../menu/templates/menu/menu-user.html        | 47 +++++++++++--------
 .../templates/menu/sortable-side-menu.html    |  6 ++-
 .../templates/bundles/image-auth-logo.html    |  3 ++
 4 files changed, 36 insertions(+), 22 deletions(-)
 create mode 100644 allianceauth/templates/bundles/image-auth-logo.html

diff --git a/allianceauth/menu/templates/menu/menu-logo.html b/allianceauth/menu/templates/menu/menu-logo.html
index 858e3884..d871f4d6 100644
--- a/allianceauth/menu/templates/menu/menu-logo.html
+++ b/allianceauth/menu/templates/menu/menu-logo.html
@@ -1,5 +1,5 @@
 {% load static %}
 
 <div class="align-items-center text-center">
-    <img src="{% static 'allianceauth/images/auth-logo.svg' %}" width="128px" height="128px" alt="{{ SITE_NAME }}">
+    {% include "bundles/image-auth-logo.html" %}
 </div>
diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index 8469811d..05c15967 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -1,30 +1,39 @@
+{% load static %}
 {% load i18n %}
 {% load evelinks %}
 {% load theme_tags %}
 
-<div style="z-index:5;" class="w100 d-flex flex-column justify-content-center align-items-center text-center pb-2 border-top border-secondary">
+<div style="z-index:5;" class="w100 d-flex flex-column justify-content-center align-items-center text-center pb-2 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0 w-100{% endif %}">
     <div class="d-flex mb-0 w-100 bg-dark text-light">
         <div class="p-2 position-relative m-2">
-            {% with request.user.profile.main_character as main %}
-                <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}">
-                <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}">
-                {% if main.alliance_id %}
-                    <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}">
-                {% elif main.faction_id %}
-                    <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}">
-                {% endif %}
-            {% endwith %}
+            {% if user.is_authenticated %}
+                {% with request.user.profile.main_character as main %}
+                    <img class="rounded-circle" src="{{ main.character_id|character_portrait_url:64 }}" alt="{{ main.character_name }}">
+                    <img class="rounded-circle position-absolute bottom-0 start-0" src="{{ main.corporation_logo_url_32 }}" alt="{{ main.corporation_name }}">
+                    {% if main.alliance_id %}
+                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.alliance_logo_url_32 }}" alt="{{ main.alliance_name }}">
+                    {% elif main.faction_id %}
+                        <img class="rounded-circle position-absolute bottom-0 end-0" src="{{ main.faction_logo_url_32 }}" alt="{{ main.faction_name }}">
+                    {% endif %}
+                {% endwith %}
+            {% else %}
+                {% include "bundles/image-auth-logo.html" with logo_width="64px" %}
+            {% endif %}
         </div>
         <div class="align-self-center text-start">
-            {% with request.user.profile.main_character as main %}
-                <h5 class="m-0">{{ main.character_name }}</h5>
-                <p class="m-0 small">{{ main.corporation_name }}</p>
-                {% if main.alliance_id %}
-                    <p class="m-0 small">{{ main.alliance_name }}</p>
-                {% elif main.faction_id %}
-                    <p class="m-0 small">{{ main.faction_name }}</p>
-                {% endif %}
-            {% endwith %}
+            {% if user.is_authenticated %}
+                {% with request.user.profile.main_character as main %}
+                    <h5 class="m-0">{{ main.character_name }}</h5>
+                    <p class="m-0 small">{{ main.corporation_name }}</p>
+                    {% if main.alliance_id %}
+                        <p class="m-0 small">{{ main.alliance_name }}</p>
+                    {% elif main.faction_id %}
+                        <p class="m-0 small">{{ main.faction_name }}</p>
+                    {% endif %}
+                {% endwith %}
+            {% else %}
+                <h5 class="m-0">{{ SITE_NAME }}</h5>
+            {% endif %}
         </div>
         <div class="ms-auto dropup">
             <button type="button" class="h-100 btn" data-bs-toggle="dropdown" aria-expanded="false">
diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index 404f9dde..fbbe51f5 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -5,7 +5,7 @@
 <div class="col-auto px-0">
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
         <div style="width: 350px;">
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100">
+            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                 {% if user.is_authenticated %}
                     <ul style="z-index:5;" id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                         <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
@@ -17,8 +17,10 @@
 
                         {% sorted_menu_items %}
                     </ul>
+
+                    {% include 'menu/menu-logo.html' %}
                 {% endif %}
-                {% include 'menu/menu-logo.html' %}
+
                 {% include 'menu/menu-user.html' %}
             </div>
         </div>
diff --git a/allianceauth/templates/bundles/image-auth-logo.html b/allianceauth/templates/bundles/image-auth-logo.html
new file mode 100644
index 00000000..b797e12d
--- /dev/null
+++ b/allianceauth/templates/bundles/image-auth-logo.html
@@ -0,0 +1,3 @@
+{% load static %}
+
+<img src="{% static 'allianceauth/images/auth-logo.svg' %}" width="{{ logo_width|default:"128px" }}" height="{% if logo_height %}{{ logo_ }}{% else %}{{ logo_width|default:"128px" }}{% endif %}" alt="{{ SITE_NAME }}">

From 4e9e22cb4bc99d01ade4f8738e96d43d691f2760 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 16 Jan 2024 20:18:46 +0100
Subject: [PATCH 03/21] [REMOVED] Unnecessary z-index and overflow

Width fixed as well
---
 allianceauth/menu/templates/menu/menu-user.html          | 2 +-
 allianceauth/menu/templates/menu/sortable-side-menu.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index 05c15967..2a390d37 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -3,7 +3,7 @@
 {% load evelinks %}
 {% load theme_tags %}
 
-<div style="z-index:5;" class="w100 d-flex flex-column justify-content-center align-items-center text-center pb-2 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0 w-100{% endif %}">
+<div class="w-100 d-flex flex-column justify-content-center align-items-center text-center border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
     <div class="d-flex mb-0 w-100 bg-dark text-light">
         <div class="p-2 position-relative m-2">
             {% if user.is_authenticated %}
diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index fbbe51f5..baa209aa 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -5,9 +5,9 @@
 <div class="col-auto px-0">
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
         <div style="width: 350px;">
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
+            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                 {% if user.is_authenticated %}
-                    <ul style="z-index:5;" id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
+                    <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                         <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">
                             <i class="nav-link fas fa-tachometer-alt fa-fw align-self-center me-3 {% navactive request 'authentication:dashboard' %}"></i>
                             <a class="nav-link flex-fill align-self-center" href="{% url 'authentication:dashboard' %}">

From fd08b987bdc60053ca20eea7d49972ab16854885 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 16 Jan 2024 20:24:32 +0100
Subject: [PATCH 04/21] =?UTF-8?q?[CHANGE]=20Ok,=20the=20overflow=20is=20ne?=
 =?UTF-8?q?eded=20for=20keep=20the=20menu=20in=20its=20bounds=20=E2=80=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 allianceauth/menu/templates/menu/sortable-side-menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index baa209aa..504e1a0e 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -5,7 +5,7 @@
 <div class="col-auto px-0">
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
         <div style="width: 350px;">
-            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
+            <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                 {% if user.is_authenticated %}
                     <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">
                         <li class="d-flex flex-wrap m-2 p-2 pt-0 pb-0 mt-0 mb-0 me-0 pe-0">

From 89193d2fcf4055fdf57b9e5478bd8d50a1f2c0c9 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 16 Jan 2024 20:32:45 +0100
Subject: [PATCH 05/21] [CHANGE] Set min width, so it's properly readable

---
 allianceauth/menu/templates/menu/menu-user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index 2a390d37..f7dcf7d0 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -39,7 +39,7 @@
             <button type="button" class="h-100 btn" data-bs-toggle="dropdown" aria-expanded="false">
                 <i class="fa-solid fa-gear fa-fw text-light"></i>
             </button>
-            <ul class="dropdown-menu">
+            <ul class="dropdown-menu" style="min-width: 200px;">
                 <li><h6 class="dropdown-header">{% translate "Language" %}</h6></li>
                 <li>
                     <a class="dropdown-item">{% include "public/lang_select.html" %}</a>

From 10096862e510db12670881ef818225835dbc4a81 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 16 Jan 2024 20:58:24 +0100
Subject: [PATCH 06/21] [CHANGE] Better padding

---
 allianceauth/menu/templates/menu/menu-user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index f7dcf7d0..e9907337 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -3,7 +3,7 @@
 {% load evelinks %}
 {% load theme_tags %}
 
-<div class="w-100 d-flex flex-column justify-content-center align-items-center text-center border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
+<div class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
     <div class="d-flex mb-0 w-100 bg-dark text-light">
         <div class="p-2 position-relative m-2">
             {% if user.is_authenticated %}

From f8baeb19a75c451456fbf224add07367dfb44730 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 16 Jan 2024 21:29:16 +0100
Subject: [PATCH 07/21] [FIX] Static no longer needed here

---
 allianceauth/menu/templates/menu/menu-logo.html | 2 --
 allianceauth/menu/templates/menu/menu-user.html | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/allianceauth/menu/templates/menu/menu-logo.html b/allianceauth/menu/templates/menu/menu-logo.html
index d871f4d6..8d8ba11d 100644
--- a/allianceauth/menu/templates/menu/menu-logo.html
+++ b/allianceauth/menu/templates/menu/menu-logo.html
@@ -1,5 +1,3 @@
-{% load static %}
-
 <div class="align-items-center text-center">
     {% include "bundles/image-auth-logo.html" %}
 </div>
diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index e9907337..6c70f976 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -1,4 +1,3 @@
-{% load static %}
 {% load i18n %}
 {% load evelinks %}
 {% load theme_tags %}
@@ -85,8 +84,6 @@
                         <a class="dropdown-item text-success" href="{% url 'authentication:login' %}" title="{% translate 'Sign In' %}"> <i class="fa-solid fa-right-to-bracket fa-fw "></i> {% translate 'Sign In' %}</a>
                     </li>
                 {% endif %}
-
-
             </ul>
         </div>
     </div>

From 8a3fb171479fe77f0eb8255cbd196ab9687b096c Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Wed, 17 Jan 2024 20:04:07 +0100
Subject: [PATCH 08/21] [CHANGE] Reduce the width of the side menu to  300px

This gives the apps a bit of wiggle room for all the tables we have there.
---
 allianceauth/menu/templates/menu/sortable-side-menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index 504e1a0e..aaa399bb 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -4,7 +4,7 @@
 
 <div class="col-auto px-0">
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
-        <div style="width: 350px;">
+        <div style="width: 300px;">
             <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                 {% if user.is_authenticated %}
                     <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">

From 333fe8497dee7cdad47e1182a74878ee350c788a Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Wed, 17 Jan 2024 22:20:30 +0100
Subject: [PATCH 09/21] [FIX] Register template to Bootstrap 5

---
 .../templates/public/register.html            | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/allianceauth/authentication/templates/public/register.html b/allianceauth/authentication/templates/public/register.html
index a4f1e77d..062bcb1e 100644
--- a/allianceauth/authentication/templates/public/register.html
+++ b/allianceauth/authentication/templates/public/register.html
@@ -1,6 +1,6 @@
 {% extends 'public/base.html' %}
 
-{% load bootstrap %}
+{% load django_bootstrap5 %}
 {% load i18n %}
 
 {% block page_title %}{% translate "Registration" %}{% endblock %}
@@ -12,16 +12,20 @@
 {% endblock %}
 
 {% block content %}
-    <div class="col-md-4 col-md-offset-4">
-        <div class="panel panel-default panel-transparent">
-            <div class="panel-body">
-                <form method="POST">
-                    {% csrf_token %}
-                    {{ form|bootstrap }}
-                    <button class="btn btn-lg btn-primary btn-block" type="submit">{% translate "Register" %}</button>
-                </form>
+    <div class="row justify-content-center">
+        <div class="col-md-4">
+            <div class="card card-login border-secondary p-3">
+                <div class="card-body">
+                    <form method="POST">
+                        {% csrf_token %}
+                        {% bootstrap_form form %}
+
+                        <button class="btn btn-primary btn-block" type="submit">{% translate "Register" %}</button>
+                    </form>
+
+                    {% include 'public/lang_select.html' %}
+                </div>
             </div>
         </div>
-        {% include 'public/lang_select.html' %}
     </div>
 {% endblock %}

From fd6c6991f5fb13be5e4bee1e6c864dd95965ec86 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Wed, 17 Jan 2024 22:25:54 +0100
Subject: [PATCH 10/21] [REMOVED] Unnecessary text class

---
 allianceauth/corputils/templates/corputils/corpstats.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/corputils/templates/corputils/corpstats.html b/allianceauth/corputils/templates/corputils/corpstats.html
index 4fb18861..988b40ae 100644
--- a/allianceauth/corputils/templates/corputils/corpstats.html
+++ b/allianceauth/corputils/templates/corputils/corpstats.html
@@ -31,7 +31,7 @@
 
         <div class="card card-default mt-4">
             <div class="card-header clearfix" role="tablist">
-                <ul class="nav nav-pills text-right float-start">
+                <ul class="nav nav-pills float-start">
                     <li class="nav-item" role="presentation">
                         <a
                             class="nav-link active"

From 867e2a1dede16821e570d0341207754ad693dd40 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Wed, 17 Jan 2024 22:28:17 +0100
Subject: [PATCH 11/21] [CHANGE] Replaced `style="width: 100%;"` with the
 appropriate BS class

---
 .../authentication/templates/authentication/tokens.html         | 2 +-
 .../permissions_tool/templates/permissions_tool/audit.html      | 2 +-
 .../permissions_tool/templates/permissions_tool/overview.html   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/allianceauth/authentication/templates/authentication/tokens.html b/allianceauth/authentication/templates/authentication/tokens.html
index e7907893..42e3c61b 100644
--- a/allianceauth/authentication/templates/authentication/tokens.html
+++ b/allianceauth/authentication/templates/authentication/tokens.html
@@ -16,7 +16,7 @@
             {% translate "This page is a best attempt, but backups or database logs can still contain your tokens. Always revoke tokens on https://community.eveonline.com/support/third-party-applications/ where possible."|urlize %}
         </p>
 
-        <table class="table" id="table_tokens" style="width: 100%;">
+        <table class="table w-100" id="table_tokens">
             <thead>
                 <tr>
                     <th>{% translate "Scopes" %}</th>
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/audit.html b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
index 4407ff9e..73535a29 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/audit.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/audit.html
@@ -23,7 +23,7 @@
         </p>
 
         <div class="table-responsive">
-            <table class="table table-striped" id="tab_permissions_audit" style="width: 100%;">
+            <table class="table table-striped w-100" id="tab_permissions_audit">
                 <thead>
                     <tr>
                         <th scope="col">{% translate "Group" %}</th>
diff --git a/allianceauth/permissions_tool/templates/permissions_tool/overview.html b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
index 8dbace83..44beb69b 100644
--- a/allianceauth/permissions_tool/templates/permissions_tool/overview.html
+++ b/allianceauth/permissions_tool/templates/permissions_tool/overview.html
@@ -23,7 +23,7 @@
         </p>
 
         <div class="table-responsive">
-            <table class="table table-striped" id="tab_permissions_overview" style="width: 100%;">
+            <table class="table table-striped w-100" id="tab_permissions_overview">
                 <thead>
                     <tr>
                         <th scope="col">{% translate "App" %}</th>

From 84d5693583452f206c023a41bb00c6a436444eb8 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Wed, 17 Jan 2024 22:29:22 +0100
Subject: [PATCH 12/21] [CHANGE] Use the right BS class

---
 .../services/templates/services/fleetformattertool.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/services/templates/services/fleetformattertool.html b/allianceauth/services/templates/services/fleetformattertool.html
index 67c1fc79..496b1f56 100644
--- a/allianceauth/services/templates/services/fleetformattertool.html
+++ b/allianceauth/services/templates/services/fleetformattertool.html
@@ -23,7 +23,7 @@
                 <div class="row justify-content-center">
                     <div class="col-md-6">
                         {% if generated != "" %}
-                            <div class="text-right mb-3">
+                            <div class="text-end mb-3">
                                 <textarea class="form-control" rows="10" cols="60">{{ generated }}</textarea>
                             </div>
                         {% endif %}

From 2bb518f7e0987de816198983b4550e0efc944f6a Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 23 Jan 2024 08:17:18 +0100
Subject: [PATCH 13/21] [CHANGE] Don't generate an empty `<p>` when no group
 description

Also, better margins on the badges.
---
 .../templates/groupmanagement/groups.html     | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/allianceauth/groupmanagement/templates/groupmanagement/groups.html b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
index f46c8515..ddd2c2d1 100644
--- a/allianceauth/groupmanagement/templates/groupmanagement/groups.html
+++ b/allianceauth/groupmanagement/templates/groupmanagement/groups.html
@@ -30,7 +30,11 @@
                 <tr>
                     <th>{% translate "Name" %}</th>
                     <th>{% translate "Description" %}</th>
-                    <th>{% translate "Leaders" %}<span class="m-1 fw-lighter badge bg-primary">{% translate "User" %}</span><span class="m-1 fw-lighter badge bg-secondary ">{% translate "Group" %}</span></th>
+                    <th>
+                        {% translate "Leaders" %}<br>
+                        <span class="my-1 me-1 fw-lighter badge bg-primary">{% translate "User" %}</span>
+                        <span class="my-1 me-1 fw-lighter badge bg-secondary">{% translate "Group" %}</span>
+                    </th>
                     <th></th>
                 </tr>
             </thead>
@@ -39,13 +43,23 @@
                 {% for g in groups %}
                     <tr>
                         <td>{{ g.group.name }}</td>
-                        <td>{{ g.group.authgroup.description|linebreaks|urlize }}</td>
+                        <td>
+                            {% if g.group.authgroup.description %}
+                                {{ g.group.authgroup.description|linebreaks|urlize }}
+                            {%  endif %}
+                        </td>
                         <td style="max-width: 30%;">
                             {% if g.group.authgroup.group_leaders.all.count %}
-                                {% for leader in g.group.authgroup.group_leaders.all %}{% if leader.profile.main_character %}<span class="m-1 badge bg-primary">{{leader.profile.main_character}}</span>{% endif %}{% endfor %}
+                                {% for leader in g.group.authgroup.group_leaders.all %}
+                                    {% if leader.profile.main_character %}
+                                        <span class="my-1 me-1 badge bg-primary">{{leader.profile.main_character}}</span>
+                                    {% endif %}
+                                {% endfor %}
                             {% endif %}
                             {% if g.group.authgroup.group_leaders.all.count %}
-                                {% for group in g.group.authgroup.group_leader_groups.all %}<span class="badge bg-secondary">{{group.name}}</span>{% endfor %}
+                                {% for group in g.group.authgroup.group_leader_groups.all %}
+                                    <span class="my-1 me-1 badge bg-secondary">{{group.name}}</span>
+                                {% endfor %}
                             {% endif %}
                         </td>
                         <td class="text-end">

From 7425176b3fb803812a604379a8cad2009516684d Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Tue, 23 Jan 2024 15:23:48 +0100
Subject: [PATCH 14/21] [CHANGE] Side menu improvements

- Increase width to 325px
- Add some CSS tricks to ensure long link names don't break the menu
---
 .../framework/css/auth-framework.css          | 20 +++++++++++++++++++
 .../menu/templates/menu/menu-item-bs5.html    |  6 +++---
 .../templates/menu/sortable-side-menu.html    |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css b/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
index 51e49703..f4f1eb74 100644
--- a/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
+++ b/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
@@ -13,6 +13,26 @@
     }
 }
 
+/* Side Navigation
+------------------------------------------------------------------------------------- */
+@media all {
+    #sidebar > div {
+        width: 325px;
+    }
+
+    #sidebar-menu li > a,
+    #sidebar-menu li > ul > li > a {
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        max-width: 210px;
+    }
+
+    #sidebar-menu li > ul > li > a {
+        max-width: 189px;
+    }
+}
+
 /* Cursor classes
 ------------------------------------------------------------------------------------- */
 @media all {
diff --git a/allianceauth/menu/templates/menu/menu-item-bs5.html b/allianceauth/menu/templates/menu/menu-item-bs5.html
index 152d0946..1fb50114 100644
--- a/allianceauth/menu/templates/menu/menu-item-bs5.html
+++ b/allianceauth/menu/templates/menu/menu-item-bs5.html
@@ -10,16 +10,16 @@
         </a>
 
         {% if item.count >= 1 %}
-            <span class="badge bg-primary m-2 align-self-center {% if item.items|length == 0 %}me-4{% endif %}">
+            <span class="badge bg-primary m-2 align-self-center {% if item.items|length == 0 %}me-2{% endif %}">
                 {{ item.count }}
             </span>
         {% elif item.url %}
-            <span class="pill m-2 me-4 align-self-center fas fa-external-link-alt"></span>
+            <span class="pill m-2 me-2 align-self-center fas fa-external-link-alt" title="{% translate 'External link' %}"></span>
         {% endif %}
 
         {% if item.items|length > 0 %}
             <span
-                class="pill m-2 me-4 align-self-center fas fa-solid fa-chevron-down"
+                class="pill m-2 me-2 align-self-center fas fa-solid fa-chevron-down"
                 type="button"
                 data-bs-toggle="collapse"
                 data-bs-target="#id-{{ item.text|slugify }}"
diff --git a/allianceauth/menu/templates/menu/sortable-side-menu.html b/allianceauth/menu/templates/menu/sortable-side-menu.html
index aaa399bb..793481f8 100644
--- a/allianceauth/menu/templates/menu/sortable-side-menu.html
+++ b/allianceauth/menu/templates/menu/sortable-side-menu.html
@@ -4,7 +4,7 @@
 
 <div class="col-auto px-0">
     <div class="collapse collapse-horizontal" tabindex="-1" id="sidebar">
-        <div style="width: 300px;">
+        <div>
             <div class="nav-padding navbar-dark bg-dark text-light px-0 d-flex flex-column overflow-hidden vh-100 {% if not user.is_authenticated %}position-relative{% endif %}">
                 {% if user.is_authenticated %}
                     <ul id="sidebar-menu" class="navbar-nav flex-column mb-auto overflow-auto pt-2">

From 9da61588ebeeece26ab0b00f9064b16a28604756 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Wed, 24 Jan 2024 10:19:16 +0100
Subject: [PATCH 15/21] [CHANGE] Change the chevron for submenu depending on
 its toggle status

---
 .../allianceauth/framework/css/auth-framework.css      | 10 ++++++++++
 allianceauth/menu/templates/menu/menu-item-bs5.html    |  7 +++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css b/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
index f4f1eb74..ff3aba71 100644
--- a/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
+++ b/allianceauth/framework/static/allianceauth/framework/css/auth-framework.css
@@ -31,6 +31,16 @@
     #sidebar-menu li > ul > li > a {
         max-width: 189px;
     }
+
+    #sidebar-menu [data-bs-toggle="collapse"] > i.fa-chevron-down,
+    #sidebar-menu [data-bs-toggle="collapse"].collapsed > i.fa-chevron-right {
+        display: block;
+    }
+
+    #sidebar-menu [data-bs-toggle="collapse"] > i.fa-chevron-right,
+    #sidebar-menu [data-bs-toggle="collapse"].collapsed > i.fa-chevron-down {
+        display: none;
+    }
 }
 
 /* Cursor classes
diff --git a/allianceauth/menu/templates/menu/menu-item-bs5.html b/allianceauth/menu/templates/menu/menu-item-bs5.html
index 1fb50114..e400e5b2 100644
--- a/allianceauth/menu/templates/menu/menu-item-bs5.html
+++ b/allianceauth/menu/templates/menu/menu-item-bs5.html
@@ -19,12 +19,15 @@
 
         {% if item.items|length > 0 %}
             <span
-                class="pill m-2 me-2 align-self-center fas fa-solid fa-chevron-down"
+                class="pill m-2 me-2 align-self-center collapsed"
                 type="button"
                 data-bs-toggle="collapse"
                 data-bs-target="#id-{{ item.text|slugify }}"
                 aria-expanded="false"
-                aria-controls="">
+                aria-controls=""
+            >
+                <i class="fas fa-chevron-right"></i>
+                <i class="fas fa-chevron-down"></i>
             </span>
             <!--<hr class="m-0 w-100">-->
             <ul class="collapse ps-1 w-100 border-start rounded-start border-light border-3" id="id-{{ item.text|slugify }}">

From 6aacb8c2e389215de7d6c324005833c6a85778ee Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Thu, 25 Jan 2024 16:29:00 +0100
Subject: [PATCH 16/21] [REMOVE] Unnecessary `active` class

---
 allianceauth/templates/allianceauth/top-menu-rh-default.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/templates/allianceauth/top-menu-rh-default.html b/allianceauth/templates/allianceauth/top-menu-rh-default.html
index 70529809..eacff4e1 100644
--- a/allianceauth/templates/allianceauth/top-menu-rh-default.html
+++ b/allianceauth/templates/allianceauth/top-menu-rh-default.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<li class="nav-item active">
+<li class="nav-item">
     <a href="{% url 'authentication:add_character' %}" class="nav-link" title="{% translate 'Add Character' %}">
         <i class="fa-solid fa-plus"></i>
         <span class="d-lg-none d-md-inline m-2">{% translate "Add Character" %}</span>

From 76efcb5266f9ea0cb43147301c51f4f5fbf9249c Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Fri, 26 Jan 2024 13:44:28 +0100
Subject: [PATCH 17/21] [ADD] Classes to the dashboard panels to identify them

This is nice to have for theming :-)
---
 .../templates/authentication/dashboard.characters.html      | 2 +-
 .../templates/authentication/dashboard.groups.html          | 2 +-
 allianceauth/menu/templates/menu/menu-user.html             | 2 +-
 .../templates/allianceauth/admin-status/overview.html       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/allianceauth/authentication/templates/authentication/dashboard.characters.html b/allianceauth/authentication/templates/authentication/dashboard.characters.html
index b2e0588d..5d89a931 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.characters.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.characters.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2">
+<div class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2 dashboard-panel-characters">
     <div class="card">
         <div class="card-body">
             <div class="d-flex align-items-center">
diff --git a/allianceauth/authentication/templates/authentication/dashboard.groups.html b/allianceauth/authentication/templates/authentication/dashboard.groups.html
index 88ed15c1..fef67e72 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.groups.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.groups.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
+<div class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2 dashboard-panel-membership">
     <div class="card h-100">
         <div class="card-body">
             <h4 class="card-title text-center">{% translate "Membership" %}</h4>
diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index 6c70f976..f47f1105 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -2,7 +2,7 @@
 {% load evelinks %}
 {% load theme_tags %}
 
-<div class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
+<div class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary aa-user-info {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
     <div class="d-flex mb-0 w-100 bg-dark text-light">
         <div class="p-2 position-relative m-2">
             {% if user.is_authenticated %}
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index 9f61a026..2208d20f 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -2,7 +2,7 @@
 {% load humanize %}
 
 {% if notifications %}
-    <div class="col-12 align-self-stretch pb-2">
+    <div class="col-12 align-self-stretch pb-2 dashboard-panel-admin-notifications">
         <div class="card">
             <div class="card-body">
                 <div class="d-flex align-items-center">
@@ -54,7 +54,7 @@
 <div class="col-12 align-self-stretch py-2">
     <div class="card">
         <div class="card-body d-flex flex-row flex-wrap">
-            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
+            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12 dashboard-panel-software-version">
                 <h4 class="ms-auto me-auto text-center">
                     {% translate "Software Version" %}
                 </h4>
@@ -97,7 +97,7 @@
                 </div>
             </div>
 
-            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
+            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12 dashboard-panel-tasl-queue">
                 <h4 class="ms-auto me-auto text-center">
                     {% translate "Task Queue" %}
                 </h4>

From 7fdbac20cb2d7177d673e94d27d8dcc770018f15 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Fri, 26 Jan 2024 15:01:44 +0100
Subject: [PATCH 18/21] [REMOVE] Unnecessary bg and text classes from user menu
 element

---
 allianceauth/menu/templates/menu/menu-user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index f47f1105..b6533f7a 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -3,7 +3,7 @@
 {% load theme_tags %}
 
 <div class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary aa-user-info {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
-    <div class="d-flex mb-0 w-100 bg-dark text-light">
+    <div class="d-flex mb-0 w-100">
         <div class="p-2 position-relative m-2">
             {% if user.is_authenticated %}
                 {% with request.user.profile.main_character as main %}

From 7ba65968edff0af7554caf4c3ee60c204ad2ba5c Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Sat, 27 Jan 2024 09:22:03 +0100
Subject: [PATCH 19/21] [CHANGE] Make it IDs instead of classes

---
 .../templates/authentication/dashboard.characters.html      | 2 +-
 .../templates/authentication/dashboard.groups.html          | 2 +-
 allianceauth/menu/templates/menu/menu-user.html             | 2 +-
 .../templates/allianceauth/admin-status/overview.html       | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/allianceauth/authentication/templates/authentication/dashboard.characters.html b/allianceauth/authentication/templates/authentication/dashboard.characters.html
index 5d89a931..83075233 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.characters.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.characters.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2 dashboard-panel-characters">
+<div id="aa-dashboard-panel-characters" class="col-12 col-xl-8 align-self-stretch p-2 ps-0 pe-0 ps-xl-0 pe-xl-2">
     <div class="card">
         <div class="card-body">
             <div class="d-flex align-items-center">
diff --git a/allianceauth/authentication/templates/authentication/dashboard.groups.html b/allianceauth/authentication/templates/authentication/dashboard.groups.html
index fef67e72..39acde52 100644
--- a/allianceauth/authentication/templates/authentication/dashboard.groups.html
+++ b/allianceauth/authentication/templates/authentication/dashboard.groups.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<div class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2 dashboard-panel-membership">
+<div id="aa-dashboard-panel-membership" class="col-12 col-xl-4 align-self-stretch py-2 ps-xl-2">
     <div class="card h-100">
         <div class="card-body">
             <h4 class="card-title text-center">{% translate "Membership" %}</h4>
diff --git a/allianceauth/menu/templates/menu/menu-user.html b/allianceauth/menu/templates/menu/menu-user.html
index b6533f7a..4d013d0b 100644
--- a/allianceauth/menu/templates/menu/menu-user.html
+++ b/allianceauth/menu/templates/menu/menu-user.html
@@ -2,7 +2,7 @@
 {% load evelinks %}
 {% load theme_tags %}
 
-<div class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary aa-user-info {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
+<div id="aa-user-info" class="w-100 d-flex flex-column justify-content-center align-items-center text-center py-1 border-top border-secondary {% if not user.is_authenticated %}position-absolute bottom-0{% endif %}">
     <div class="d-flex mb-0 w-100">
         <div class="p-2 position-relative m-2">
             {% if user.is_authenticated %}
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index 2208d20f..fbf8d89e 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -2,7 +2,7 @@
 {% load humanize %}
 
 {% if notifications %}
-    <div class="col-12 align-self-stretch pb-2 dashboard-panel-admin-notifications">
+    <div id="aa-dashboard-panel-admin-notifications" class="col-12 align-self-stretch pb-2">
         <div class="card">
             <div class="card-body">
                 <div class="d-flex align-items-center">
@@ -54,7 +54,7 @@
 <div class="col-12 align-self-stretch py-2">
     <div class="card">
         <div class="card-body d-flex flex-row flex-wrap">
-            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12 dashboard-panel-software-version">
+            <div id="aa-dashboard-panel-software-version" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
                 <h4 class="ms-auto me-auto text-center">
                     {% translate "Software Version" %}
                 </h4>
@@ -97,7 +97,7 @@
                 </div>
             </div>
 
-            <div class="col-xl-6 col-lg-12 col-md-12 col-sm-12 dashboard-panel-tasl-queue">
+            <div id="aa-dashboard-panel-task-queue" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">
                 <h4 class="ms-auto me-auto text-center">
                     {% translate "Task Queue" %}
                 </h4>

From 8362d11714ef615a83491cbd0a1758f9aaa69154 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Sun, 28 Jan 2024 10:18:11 +0100
Subject: [PATCH 20/21] [FIX] Mark selected theme in the theme dropdown in the
 user menu

---
 allianceauth/theme/templates/theme/theme_select.html | 10 +++++++---
 allianceauth/theme/templatetags/theme_tags.py        |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/allianceauth/theme/templates/theme/theme_select.html b/allianceauth/theme/templates/theme/theme_select.html
index 96fea987..c83b7726 100644
--- a/allianceauth/theme/templates/theme/theme_select.html
+++ b/allianceauth/theme/templates/theme/theme_select.html
@@ -1,9 +1,13 @@
+{% load i18n %}
+
 <form action="{% url 'theme' %}?next={{ next|urlencode }}" method="post">
     {% csrf_token %}
-    <select name="theme" value="theme" class="form-select" aria-label="" onchange="this.form.submit()">
-        <option selected>Select Theme</option>
+
+    <select name="theme" class="form-select" aria-label="" onchange="this.form.submit()">
+        <option selected>{% translate "Select Theme" %}</option>
+
         {% for theme in themes %}
-            <option value="{{ theme.get_name }}">{{ theme.name }}</option>
+            <option value="{{ theme.get_name }}"{% if selected_theme.name == theme.name %} selected="selected"{% endif %}>{{ theme.name }}</option>
         {% endfor %}
     </select>
 </form>
diff --git a/allianceauth/theme/templatetags/theme_tags.py b/allianceauth/theme/templatetags/theme_tags.py
index 4409c151..68a7ab4e 100644
--- a/allianceauth/theme/templatetags/theme_tags.py
+++ b/allianceauth/theme/templatetags/theme_tags.py
@@ -72,5 +72,6 @@ def theme_select(context):
     request = context['request']
     return {
         'next': request.path,
-        'themes': get_hooks('theme_hook')
+        'themes': get_hooks('theme_hook'),
+        'selected_theme': get_theme(request)
     }

From 34dd4802a8f6c63fda0dbde06b51e5439ec752e6 Mon Sep 17 00:00:00 2001
From: Peter Pfeufer <info@ppfeufer.de>
Date: Sun, 11 Feb 2024 15:03:49 +0100
Subject: [PATCH 21/21] [CHANGE] Some margins modified to be in line with the
 dashboard

---
 .../services/templates/services/services_ctrl_base.html         | 2 +-
 allianceauth/templates/allianceauth/admin-status/overview.html  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/allianceauth/services/templates/services/services_ctrl_base.html b/allianceauth/services/templates/services/services_ctrl_base.html
index d039db03..a0cb682b 100644
--- a/allianceauth/services/templates/services/services_ctrl_base.html
+++ b/allianceauth/services/templates/services/services_ctrl_base.html
@@ -1,6 +1,6 @@
 {% load i18n %}
 
-<div class="card text-center m-3" style="min-width: 18rem; min-height: 18rem;">
+<div class="card text-center m-2" style="min-width: 18rem; min-height: 18rem;">
     <div class="card-body">
         <h5 class="card-title">{% block title %}{% endblock title %}</h5>
 
diff --git a/allianceauth/templates/allianceauth/admin-status/overview.html b/allianceauth/templates/allianceauth/admin-status/overview.html
index fbf8d89e..b7ce5b1d 100644
--- a/allianceauth/templates/allianceauth/admin-status/overview.html
+++ b/allianceauth/templates/allianceauth/admin-status/overview.html
@@ -51,7 +51,7 @@
     </div>
 {% endif %}
 
-<div class="col-12 align-self-stretch py-2">
+<div class="col-12 align-self-stretch pb-2">
     <div class="card">
         <div class="card-body d-flex flex-row flex-wrap">
             <div id="aa-dashboard-panel-software-version" class="col-xl-6 col-lg-12 col-md-12 col-sm-12">