Merge branch 'main' into patch-3

diff --combined css/unrealircd-admin.css
index 6f312710e0b93f8ae218835dc75d9758822f87a3,972a6cbd104274cbe8f100715c810fd950cda293..fa224df895adbdcb7838f3784221c8e8804f84a2
--- 1/css/unrealircd-admin.css
--- 2/css/unrealircd-admin.css
+++ b/css/unrealircd-admin.css
@@@ -15,32 -15,10 +15,10 @@@
        margin: 2px;
  }
  
- .form-control {
-       height: 10px;
-       margin: 5px;
- }
-   
  .short-form-control {
        width: 70%;
  }
  
- .nav-item {
-       margin-left: 2px;
-       margin-right: 2px;
- }
- .navbar-nav li> {
-       border-radius: 4px;
- }
- .navbar-nav li>a:hover,.navbar-nav li.active {
-       color: white;
-       background-color: #4B86EE;
-       border-radius: 4px;
- }
- .navbar-nav li>a:hover,.navbar-nav li>a:focus {
-       color: white;
-       background-color: #6ca0f8;
-       border-radius: 4px;
- }
  
  .align_right {
        width: 10px;
@@@ -66,15 -44,6 +44,6 @@@
        text-align: right;
  }
  
- 
- 
- 
- *,
- *:before,
- *:after {
-       box-sizing: inherit;
-       /* enable the "border-box effect" everywhere */
- }
  body {
      padding-bottom: 120px;
  }
@@@ -245,7 -214,6 +214,8 @@@ body 
        width: inherit;
  }
  
 -.card-header i.fa {
 +.card-header .badge {
 +      top:-10px;
 +      left:20px;
+       line-height: 74px;
  }