Merge branch 'main' into task/migrate-grid-and-badge-classes-to-bootstrap-5

# Conflicts:
#	apps/client/src/app/components/admin-settings/admin-settings.component.html
#	apps/client/src/app/components/header/header.component.html
#	apps/client/src/app/components/user-account-membership/user-account-membership.html
#	apps/client/src/app/pages/features/features-page.html
#	apps/client/src/app/pages/pricing/pricing-page.html
#	apps/client/src/app/pages/register/user-account-registration-dialog/user-account-registration-dialog.html
#	libs/ui/src/lib/activities-table/activities-table.component.html

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Upgraded `bootstrap` from version `4.6.2` to `5.3.8`
 
+### Fixed
+
+- Fixed the missing padding of the base currency and performance calculation labels in the user account settings
+
 ## 3.86.0 - 2026-10-13
 
 ### Added

apps/client/src/app/components/user-account-settings/user-account-settings.html

@@ -9,7 +9,7 @@
             [class.mb-2]="!hasImpersonationId"
             [class.mb-4]="hasImpersonationId"
           >
-            <div class="align-items-center d-flex pt-1 pt-1 w-50">
+            <div class="align-items-center d-flex pe-1 pt-1 w-50">
               <ng-container i18n>Base Currency</ng-container>
             </div>
             <div class="ps-1 w-50" [formGroup]="baseCurrencyForm">
@@ -32,7 +32,7 @@
           </div>
           @if (user?.settings?.isExperimentalFeatures && !user?.subscription) {
             <div class="d-flex mb-2">
-              <div class="align-items-center d-flex pt-1 pt-1 w-50">
+              <div class="align-items-center d-flex pe-1 pt-1 w-50">
                 <ng-container i18n>Performance Calculation</ng-container>
               </div>
               <div class="ps-1 w-50">

apps/client/src/styles.scss

@@ -401,12 +401,6 @@ ngx-skeleton-loader {
   }
 }
 
-.mat-mdc-checkbox {
-  label {
-    margin-bottom: 0;
-  }
-}
-
 .mat-mdc-dialog-container {
   .mdc-dialog__content {
     --mat-dialog-supporting-text-color: rgba(var(--dark-primary-text));
@@ -490,10 +484,6 @@ ngx-skeleton-loader {
   min-width: unset !important;
 }
 
-.overflow-x-auto {
-  overflow-x: auto;
-}
-
 .page {
   display: flex;
   overflow-y: auto;
@@ -521,10 +511,6 @@ ngx-skeleton-loader {
   }
 }
 
-.text-decoration-underline {
-  text-decoration: underline !important;
-}
-
 .text-line-through {
   text-decoration: line-through;
 }