From 49501928b8a55d918f5c293da1e4c6d230248848 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Fri, 23 Feb 2024 18:06:48 +0100
Subject: [PATCH 1/6] Remove bootstrap and enable tailwind preflight

---
 apps/web/src/scss/styles.scss | 51 -----------------------------------
 apps/web/tailwind.config.js   |  1 +
 2 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/apps/web/src/scss/styles.scss b/apps/web/src/scss/styles.scss
index 05cd9fef4eb..3c0fe93bc9c 100644
--- a/apps/web/src/scss/styles.scss
+++ b/apps/web/src/scss/styles.scss
@@ -5,55 +5,4 @@
 @import "../../../../libs/components/src/multi-select/scss/bw.theme";
 @import "@angular/cdk/overlay-prebuilt.css";
 
-//@import "~bootstrap/scss/bootstrap";
-@import "~bootstrap/scss/_functions";
-@import "~bootstrap/scss/_variables";
-@import "~bootstrap/scss/_mixins";
-@import "~bootstrap/scss/_root";
-@import "~bootstrap/scss/_reboot";
-@import "~bootstrap/scss/_type";
-@import "~bootstrap/scss/_images";
-@import "~bootstrap/scss/_code";
-@import "~bootstrap/scss/_grid";
-@import "~bootstrap/scss/_tables";
-@import "~bootstrap/scss/_forms";
-@import "~bootstrap/scss/_buttons";
-@import "~bootstrap/scss/_transitions";
-@import "~bootstrap/scss/_dropdown";
-// @import "~bootstrap/scss/_button-group";
-@import "~bootstrap/scss/_input-group";
-// @import "~bootstrap/scss/_custom-forms";
-@import "~bootstrap/scss/_nav";
-@import "~bootstrap/scss/_navbar";
-@import "~bootstrap/scss/_card";
-// @import "~bootstrap/scss/_breadcrumb";
-// @import "~bootstrap/scss/_pagination";
-// @import "~bootstrap/scss/_jumbotron";
-// @import "~bootstrap/scss/_alert";
-@import "~bootstrap/scss/_progress";
-// @import "~bootstrap/scss/_media";
-@import "~bootstrap/scss/_list-group";
-@import "~bootstrap/scss/_close";
-//@import "~bootstrap/scss/_toasts";
-@import "~bootstrap/scss/_modal";
-// @import "~bootstrap/scss/_tooltip";
-// @import "~bootstrap/scss/_popover";
-// @import "~bootstrap/scss/_carousel";
-// @import "~bootstrap/scss/_spinners";
-@import "~bootstrap/scss/_utilities";
-@import "~bootstrap/scss/_print";
-
 @import "~ngx-toastr/toastr";
-
-@import "./base";
-@import "./buttons";
-@import "./callouts";
-@import "./cards";
-@import "./forms";
-@import "./navigation";
-@import "./modals";
-@import "./pages";
-@import "./plugins";
-@import "./tables";
-@import "./toasts";
-@import "./vault-filters";
diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js
index a944f9dd672..56c520f5e2c 100644
--- a/apps/web/tailwind.config.js
+++ b/apps/web/tailwind.config.js
@@ -6,5 +6,6 @@ config.content = [
   "../../libs/components/src/**/*.{html,ts}",
   "../../bitwarden_license/bit-web/src/**/*.{html,ts}",
 ];
+config.corePlugins.preflight = true;
 
 module.exports = config;

From 49e84b6c8ad2956de6cc6ff5635bdc09b01a9621 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Wed, 10 Jul 2024 17:37:39 +0200
Subject: [PATCH 2/6] Overwrite fonts

---
 libs/components/tailwind.config.base.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libs/components/tailwind.config.base.js b/libs/components/tailwind.config.base.js
index 88e7549780f..a322dc86065 100644
--- a/libs/components/tailwind.config.base.js
+++ b/libs/components/tailwind.config.base.js
@@ -87,6 +87,18 @@ module.exports = {
         700: rgba("--color-primary-700"),
       },
     },
+    fontFamily: {
+      sans: [
+        '"Open Sans"',
+        '"Helvetica Neue"',
+        "Helvetica",
+        "Arial",
+        "sans-serif",
+        '"Apple Color Emoji"',
+        '"Segoe UI Emoji"',
+        '"Segoe UI Symbol"',
+      ],
+    },
     ringOffsetColor: ({ theme }) => ({
       DEFAULT: theme("colors.background"),
       ...theme("colors"),

From 180144ba6cd0ea98710a606c361da9c6bf3eae7d Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Wed, 10 Jul 2024 17:40:44 +0200
Subject: [PATCH 3/6] Replace sr-only with tw-sr-only

---
 .../manage/group-add-edit.component.html           |  2 +-
 .../organizations/manage/groups.component.html     |  2 +-
 .../organizations/manage/new-groups.component.html |  2 +-
 .../organizations/members/members.component.html   |  2 +-
 .../access-selector/access-selector.component.html |  2 +-
 .../accept-family-sponsorship.component.html       |  2 +-
 .../providers/providers.component.html             |  4 ++--
 .../login-decryption-options.component.html        |  2 +-
 .../accept-organization.component.html             |  2 +-
 .../auth/settings/two-factor-setup.component.html  |  4 ++--
 .../src/app/auth/verify-email-token.component.html |  2 +-
 .../trial-billing-step.component.html              |  2 +-
 .../organization-subscription-cloud.component.html |  2 +-
 ...ganization-subscription-selfhost.component.html |  6 +++---
 apps/web/src/app/tools/generator.component.html    |  2 +-
 .../pages/exposed-passwords-report.component.html  |  4 ++--
 .../inactive-two-factor-report.component.html      |  6 +++---
 .../pages/reused-passwords-report.component.html   |  6 +++---
 .../pages/unsecured-websites-report.component.html |  6 +++---
 .../pages/weak-passwords-report.component.html     |  6 +++---
 apps/web/src/app/tools/send/send.component.html    | 14 +++++++-------
 .../vault-items/vault-cipher-row.component.html    |  4 ++--
 .../add-edit-custom-fields.component.html          |  2 +-
 .../individual-vault/attachments.component.html    |  4 ++--
 .../vault/individual-vault/vault.component.html    |  2 +-
 .../src/app/vault/org-vault/vault.component.html   |  2 +-
 .../domain-verification.component.html             |  2 +-
 .../providers/clients/clients.component.html       |  2 +-
 .../providers/manage/people.component.html         |  4 ++--
 .../providers/manage/user-add-edit.component.html  |  2 +-
 .../providers/setup/setup-provider.component.html  |  2 +-
 .../providers/setup/setup.component.html           |  2 +-
 .../bit-web/src/app/auth/sso/sso.component.ts      |  2 +-
 .../clients/manage-clients.component.html          |  2 +-
 .../provider-payment-method.component.html         |  2 +-
 .../provider-subscription.component.html           |  2 +-
 36 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
index eaf10405dbf..3151c303ec9 100644
--- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
@@ -13,7 +13,7 @@
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
-        <span class="sr-only">{{ "loading" | i18n }}</span>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </div>
 
       <bit-tab-group *ngIf="!loading" [(selectedIndex)]="tabIndex">
diff --git a/apps/web/src/app/admin-console/organizations/manage/groups.component.html b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
index 1a1a7cdb904..2ebafb38fc9 100644
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
@@ -16,7 +16,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="!loading && visibleGroups">
   <p *ngIf="!visibleGroups.length">{{ "noGroupsInList" | i18n }}</p>
diff --git a/apps/web/src/app/admin-console/organizations/manage/new-groups.component.html b/apps/web/src/app/admin-console/organizations/manage/new-groups.component.html
index 3e659e5b6a8..1254d48cc76 100644
--- a/apps/web/src/app/admin-console/organizations/manage/new-groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/new-groups.component.html
@@ -16,7 +16,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="!loading">
   <p *ngIf="!dataSource.filteredData.length">{{ "noGroupsInList" | i18n }}</p>
diff --git a/apps/web/src/app/admin-console/organizations/members/members.component.html b/apps/web/src/app/admin-console/organizations/members/members.component.html
index 99afe8099a6..3b0e094ce96 100644
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -52,7 +52,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container *ngIf="firstLoaded">
   <p *ngIf="!dataSource.filteredData.length">{{ "noMembersInList" | i18n }}</p>
diff --git a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
index 9077bd747fd..aff5d25ee08 100644
--- a/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
+++ b/apps/web/src/app/admin-console/organizations/shared/components/access-selector/access-selector.component.html
@@ -85,7 +85,7 @@
 
       <td bitCell *ngIf="permissionMode != 'hidden'">
         <ng-container *ngIf="canEditItemPermission(item); else readOnlyPerm">
-          <label class="sr-only" [for]="'permission' + i"
+          <label class="tw-sr-only" [for]="'permission' + i"
             >{{ item.labelName }} {{ "permission" | i18n }}</label
           >
           <div class="tw-relative tw-inline-block">
diff --git a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
index e7eb29a3ac7..7640e1c7366 100644
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
@@ -7,7 +7,7 @@
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "loading" | i18n }}</span>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </p>
   </div>
 </div>
diff --git a/apps/web/src/app/admin-console/providers/providers.component.html b/apps/web/src/app/admin-console/providers/providers.component.html
index d07342c85c2..560c164415c 100644
--- a/apps/web/src/app/admin-console/providers/providers.component.html
+++ b/apps/web/src/app/admin-console/providers/providers.component.html
@@ -3,7 +3,7 @@
 <bit-container>
   <p *ngIf="!loaded" class="text-muted">
     <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </p>
   <ng-container *ngIf="loaded">
     <table class="table table-hover table-list" *ngIf="providers && providers.length">
@@ -20,7 +20,7 @@
                 title="{{ 'providerIsDisabled' | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="sr-only">{{ "providerIsDisabled" | i18n }}</span>
+              <span class="tw-sr-only">{{ "providerIsDisabled" | i18n }}</span>
             </ng-container>
           </td>
         </tr>
diff --git a/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.html b/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.html
index ed59cc12388..615edb82d0c 100644
--- a/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.html
+++ b/apps/web/src/app/auth/login/login-decryption-options/login-decryption-options.component.html
@@ -13,7 +13,7 @@
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
-        <span class="sr-only">{{ "loading" | i18n }}</span>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </p>
     </ng-container>
 
diff --git a/apps/web/src/app/auth/organization-invite/accept-organization.component.html b/apps/web/src/app/auth/organization-invite/accept-organization.component.html
index 04258e7a46a..88eaa37e8d2 100644
--- a/apps/web/src/app/auth/organization-invite/accept-organization.component.html
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.component.html
@@ -7,7 +7,7 @@
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "loading" | i18n }}</span>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </p>
   </div>
 </div>
diff --git a/apps/web/src/app/auth/settings/two-factor-setup.component.html b/apps/web/src/app/auth/settings/two-factor-setup.component.html
index 33265e91f78..3595d9a7dcb 100644
--- a/apps/web/src/app/auth/settings/two-factor-setup.component.html
+++ b/apps/web/src/app/auth/settings/two-factor-setup.component.html
@@ -39,7 +39,7 @@ <h2 [ngClass]="{ 'mt-5': !organizationId }">
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "loading" | i18n }}</span>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </small>
   </h2>
   <bit-callout type="warning" *ngIf="showPolicyWarning">
@@ -64,7 +64,7 @@ <h3 class="mb-0">
               title="{{ 'enabled' | i18n }}"
               aria-hidden="true"
             ></i>
-            <span class="sr-only">{{ "enabled" | i18n }}</span>
+            <span class="tw-sr-only">{{ "enabled" | i18n }}</span>
           </ng-container>
           <app-premium-badge *ngIf="p.premium"></app-premium-badge>
         </h3>
diff --git a/apps/web/src/app/auth/verify-email-token.component.html b/apps/web/src/app/auth/verify-email-token.component.html
index 9e0aad8b384..39a7d4524f8 100644
--- a/apps/web/src/app/auth/verify-email-token.component.html
+++ b/apps/web/src/app/auth/verify-email-token.component.html
@@ -7,7 +7,7 @@
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "loading" | i18n }}</span>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </p>
   </div>
 </div>
diff --git a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
index fb7c774d6db..71a4ff119c2 100644
--- a/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
+++ b/apps/web/src/app/billing/accounts/trial-initiation/trial-billing-step.component.html
@@ -4,7 +4,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <form
   #form
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
index e11cf602ad2..8e17c46e34f 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-cloud.component.html
@@ -3,7 +3,7 @@
 <bit-container *ngIf="!isProviderManaged">
   <ng-container *ngIf="!firstLoaded && loading">
     <i class="bwi bwi-spinner bwi-spin text-muted" title="{{ 'loading' | i18n }}"></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </ng-container>
 
   <app-org-subscription-hidden
diff --git a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
index b4c1224db94..7f3e794609d 100644
--- a/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
+++ b/apps/web/src/app/billing/organizations/organization-subscription-selfhost.component.html
@@ -3,7 +3,7 @@
 <bit-container>
   <ng-container *ngIf="!firstLoaded && loading">
     <i class="bwi bwi-spinner bwi-spin text-muted" title="{{ 'loading' | i18n }}"></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </ng-container>
 
   <app-org-subscription-hidden
@@ -32,7 +32,7 @@
           rel="noreferrer"
         >
           <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-          <span class="sr-only">{{ "licensePaidFeaturesHelp" | i18n }}</span>
+          <span class="tw-sr-only">{{ "licensePaidFeaturesHelp" | i18n }}</span>
         </a>
       </dt>
       <dd *ngIf="subscription.hasExpiration" [ngClass]="{ 'tw-text-danger': showAsExpired }">
@@ -83,7 +83,7 @@ <h2 class="mt-5">
               rel="noreferrer"
             >
               <i class="bwi bwi-question-circle" aria-hidden="true"></i>
-              <span class="sr-only">{{ "billingSyncHelp" | i18n }}</span>
+              <span class="tw-sr-only">{{ "billingSyncHelp" | i18n }}</span>
             </a>
           </bit-label>
           <bit-hint>
diff --git a/apps/web/src/app/tools/generator.component.html b/apps/web/src/app/tools/generator.component.html
index 4be83c3edb5..f52d1f020d3 100644
--- a/apps/web/src/app/tools/generator.component.html
+++ b/apps/web/src/app/tools/generator.component.html
@@ -126,7 +126,7 @@
             [value]="passwordOptions.length"
           />
           <span
-            class="sr-only"
+            class="tw-sr-only"
             attr.aria-label="{{ 'passwordMinLength' | i18n }}"
             role="status"
             aria-live="polite"
diff --git a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
index 30801a42fdc..5842cb7205e 100644
--- a/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/exposed-passwords-report.component.html
@@ -62,7 +62,7 @@
                   title="{{ 'shared' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "shared" | i18n }}</span>
+                <span class="tw-sr-only">{{ "shared" | i18n }}</span>
               </ng-container>
               <ng-container *ngIf="c.hasAttachments">
                 <i
@@ -71,7 +71,7 @@
                   title="{{ 'attachments' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "attachments" | i18n }}</span>
+                <span class="tw-sr-only">{{ "attachments" | i18n }}</span>
               </ng-container>
               <br />
               <small>{{ c.subTitle }}</small>
diff --git a/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.html b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.html
index ae03a3bcb80..d9df2cf6c9b 100644
--- a/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/inactive-two-factor-report.component.html
@@ -8,7 +8,7 @@
       title="{{ 'loading' | i18n }}"
       aria-hidden="true"
     ></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </div>
   <div class="mt-4" *ngIf="hasLoaded">
     <app-callout type="success" title="{{ 'goodNews' | i18n }}" *ngIf="!ciphers.length">
@@ -58,7 +58,7 @@
                   title="{{ 'shared' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "shared" | i18n }}</span>
+                <span class="tw-sr-only">{{ "shared" | i18n }}</span>
               </ng-container>
               <ng-container *ngIf="c.hasAttachments">
                 <i
@@ -67,7 +67,7 @@
                   title="{{ 'attachments' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "attachments" | i18n }}</span>
+                <span class="tw-sr-only">{{ "attachments" | i18n }}</span>
               </ng-container>
               <br />
               <small>{{ c.subTitle }}</small>
diff --git a/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.html
index 549773ba8ce..c4369144673 100644
--- a/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/reused-passwords-report.component.html
@@ -8,7 +8,7 @@
       title="{{ 'loading' | i18n }}"
       aria-hidden="true"
     ></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </div>
   <div class="mt-4" *ngIf="hasLoaded">
     <app-callout type="success" title="{{ 'goodNews' | i18n }}" *ngIf="!ciphers.length">
@@ -69,7 +69,7 @@
                   title="{{ 'shared' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "shared" | i18n }}</span>
+                <span class="tw-sr-only">{{ "shared" | i18n }}</span>
               </ng-container>
               <ng-container *ngIf="c.hasAttachments">
                 <i
@@ -78,7 +78,7 @@
                   title="{{ 'attachments' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "attachments" | i18n }}</span>
+                <span class="tw-sr-only">{{ "attachments" | i18n }}</span>
               </ng-container>
               <br />
               <small>{{ c.subTitle }}</small>
diff --git a/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.html b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.html
index ced0ff9731d..87447e45273 100644
--- a/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/unsecured-websites-report.component.html
@@ -8,7 +8,7 @@
       title="{{ 'loading' | i18n }}"
       aria-hidden="true"
     ></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </div>
   <div class="mt-4" *ngIf="hasLoaded">
     <app-callout type="success" title="{{ 'goodNews' | i18n }}" *ngIf="!ciphers.length">
@@ -59,7 +59,7 @@
                   title="{{ 'shared' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "shared" | i18n }}</span>
+                <span class="tw-sr-only">{{ "shared" | i18n }}</span>
               </ng-container>
               <ng-container *ngIf="c.hasAttachments">
                 <i
@@ -68,7 +68,7 @@
                   title="{{ 'attachments' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "attachments" | i18n }}</span>
+                <span class="tw-sr-only">{{ "attachments" | i18n }}</span>
               </ng-container>
               <br />
               <small>{{ c.subTitle }}</small>
diff --git a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html
index a943c8c29ec..0597948e5d9 100644
--- a/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html
+++ b/apps/web/src/app/tools/reports/pages/weak-passwords-report.component.html
@@ -8,7 +8,7 @@
       title="{{ 'loading' | i18n }}"
       aria-hidden="true"
     ></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </div>
   <div class="mt-4" *ngIf="hasLoaded">
     <app-callout type="success" title="{{ 'goodNews' | i18n }}" *ngIf="!ciphers.length">
@@ -67,7 +67,7 @@
                   title="{{ 'shared' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "shared" | i18n }}</span>
+                <span class="tw-sr-only">{{ "shared" | i18n }}</span>
               </ng-container>
               <ng-container *ngIf="c.hasAttachments">
                 <i
@@ -76,7 +76,7 @@
                   title="{{ 'attachments' | i18n }}"
                   aria-hidden="true"
                 ></i>
-                <span class="sr-only">{{ "attachments" | i18n }}</span>
+                <span class="tw-sr-only">{{ "attachments" | i18n }}</span>
               </ng-container>
               <br />
               <small>{{ c.subTitle }}</small>
diff --git a/apps/web/src/app/tools/send/send.component.html b/apps/web/src/app/tools/send/send.component.html
index 9a66c85c78f..5a88f45cdc6 100644
--- a/apps/web/src/app/tools/send/send.component.html
+++ b/apps/web/src/app/tools/send/send.component.html
@@ -7,7 +7,7 @@
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
-        <span class="sr-only">{{ "loading" | i18n }}</span>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </ng-container>
     </small>
   </ng-container>
@@ -108,7 +108,7 @@ <h3>{{ "types" | i18n }}</h3>
                 title="{{ 'disabled' | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="sr-only">{{ "disabled" | i18n }}</span>
+              <span class="tw-sr-only">{{ "disabled" | i18n }}</span>
             </ng-container>
             <ng-container *ngIf="s.password">
               <i
@@ -117,7 +117,7 @@ <h3>{{ "types" | i18n }}</h3>
                 title="{{ 'password' | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="sr-only">{{ "password" | i18n }}</span>
+              <span class="tw-sr-only">{{ "password" | i18n }}</span>
             </ng-container>
             <ng-container *ngIf="s.maxAccessCountReached">
               <i
@@ -126,7 +126,7 @@ <h3>{{ "types" | i18n }}</h3>
                 title="{{ 'maxAccessCountReached' | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="sr-only">{{ "maxAccessCountReached" | i18n }}</span>
+              <span class="tw-sr-only">{{ "maxAccessCountReached" | i18n }}</span>
             </ng-container>
             <ng-container *ngIf="s.expired">
               <i
@@ -135,7 +135,7 @@ <h3>{{ "types" | i18n }}</h3>
                 title="{{ 'expired' | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="sr-only">{{ "expired" | i18n }}</span>
+              <span class="tw-sr-only">{{ "expired" | i18n }}</span>
             </ng-container>
             <ng-container *ngIf="s.pendingDelete">
               <i
@@ -144,7 +144,7 @@ <h3>{{ "types" | i18n }}</h3>
                 title="{{ 'pendingDeletion' | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="sr-only">{{ "pendingDeletion" | i18n }}</span>
+              <span class="tw-sr-only">{{ "pendingDeletion" | i18n }}</span>
             </ng-container>
           </td>
           <td bitCell class="tw-text-muted" (click)="editSend(s)" class="tw-cursor-pointer">
@@ -189,7 +189,7 @@ <h3>{{ "types" | i18n }}</h3>
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
-        <span class="sr-only">{{ "loading" | i18n }}</span>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </ng-container>
       <ng-container *ngIf="loaded">
         <bit-no-items [icon]="noItemIcon" class="tw-text-main">
diff --git a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
index af2a8443edf..a8bec2be18b 100644
--- a/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
+++ b/apps/web/src/app/vault/components/vault-items/vault-cipher-row.component.html
@@ -34,7 +34,7 @@
         title="{{ 'attachments' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "attachments" | i18n }}</span>
+      <span class="tw-sr-only">{{ "attachments" | i18n }}</span>
       <ng-container *ngIf="showFixOldAttachments">
         <i
           class="bwi bwi-exclamation-triangle tw-ml-2 tw-leading-normal tw-text-warning"
@@ -42,7 +42,7 @@
           title="{{ 'attachmentsNeedFix' | i18n }}"
           aria-hidden="true"
         ></i>
-        <span class="sr-only">{{ "attachmentsNeedFix" | i18n }}</span>
+        <span class="tw-sr-only">{{ "attachmentsNeedFix" | i18n }}</span>
       </ng-container>
     </ng-container>
   </div>
diff --git a/apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.html b/apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.html
index dfba89e9620..1c2a75737e0 100644
--- a/apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.html
+++ b/apps/web/src/app/vault/individual-vault/add-edit-custom-fields.component.html
@@ -161,7 +161,7 @@ <h3 class="mt-4">{{ "customFields" | i18n }}</h3>
   </a>
   <div class="row" *ngIf="!cipher.isDeleted && !viewOnly && !(!cipher.edit && editMode)">
     <div class="col-5">
-      <label for="addFieldType" class="sr-only">{{ "type" | i18n }}</label>
+      <label for="addFieldType" class="tw-sr-only">{{ "type" | i18n }}</label>
       <select id="addFieldType" class="form-control" name="AddFieldType" [(ngModel)]="addFieldType">
         <option *ngFor="let o of addFieldTypeOptions" [ngValue]="o.value">{{ o.name }}</option>
         <option
diff --git a/apps/web/src/app/vault/individual-vault/attachments.component.html b/apps/web/src/app/vault/individual-vault/attachments.component.html
index 5a2c72451ee..d657cd7f6c3 100644
--- a/apps/web/src/app/vault/individual-vault/attachments.component.html
+++ b/apps/web/src/app/vault/individual-vault/attachments.component.html
@@ -51,7 +51,7 @@ <h1 class="modal-title" id="attachmentsTitle">
                         title="{{ 'attachmentFixDescription' | i18n }}"
                         aria-hidden="true"
                       ></i>
-                      <span class="sr-only">{{ "attachmentFixDescription" | i18n }}</span></a
+                      <span class="tw-sr-only">{{ "attachmentFixDescription" | i18n }}</span></a
                     >
                     <button
                       type="button"
@@ -96,7 +96,7 @@ <h1 class="modal-title" id="attachmentsTitle">
         </table>
         <div *ngIf="!viewOnly">
           <h3>{{ "newAttachment" | i18n }}</h3>
-          <label for="file" class="sr-only">{{ "file" | i18n }}</label>
+          <label for="file" class="tw-sr-only">{{ "file" | i18n }}</label>
           <input type="file" id="file" class="form-control-file" name="file" required />
           <small class="form-text text-muted">{{ "maxFileSize" | i18n }}</small>
         </div>
diff --git a/apps/web/src/app/vault/individual-vault/vault.component.html b/apps/web/src/app/vault/individual-vault/vault.component.html
index 780614c3303..8bad73928a4 100644
--- a/apps/web/src/app/vault/individual-vault/vault.component.html
+++ b/apps/web/src/app/vault/individual-vault/vault.component.html
@@ -63,7 +63,7 @@
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "loading" | i18n }}</span>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </div>
     <div
       *ngIf="isEmpty && !performingInitialLoad"
diff --git a/apps/web/src/app/vault/org-vault/vault.component.html b/apps/web/src/app/vault/org-vault/vault.component.html
index 7d148026c1a..881b0948c01 100644
--- a/apps/web/src/app/vault/org-vault/vault.component.html
+++ b/apps/web/src/app/vault/org-vault/vault.component.html
@@ -140,7 +140,7 @@
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "loading" | i18n }}</span>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </div>
   </div>
 </div>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html
index 1d71deca122..dee663eb199 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/organizations/manage/domain-verification/domain-verification.component.html
@@ -10,7 +10,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
 <ng-container *ngIf="!loading">
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
index 4d4c7f11076..220a2214600 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/clients/clients.component.html
@@ -21,7 +21,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
 <ng-container
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
index b145f16daf1..36bc6543696 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/people.component.html
@@ -82,7 +82,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <ng-container
   *ngIf="
@@ -134,7 +134,7 @@
                 title="{{ 'userUsingTwoStep' | i18n }}"
                 aria-hidden="true"
               ></i>
-              <span class="sr-only">{{ "userUsingTwoStep" | i18n }}</span>
+              <span class="tw-sr-only">{{ "userUsingTwoStep" | i18n }}</span>
             </ng-container>
           </td>
           <td>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html
index 11f6ae07d83..78d80d005c9 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/user-add-edit.component.html
@@ -27,7 +27,7 @@ <h2 class="modal-title" id="userAddEditTitle">
           title="{{ 'loading' | i18n }}"
           aria-hidden="true"
         ></i>
-        <span class="sr-only">{{ "loading" | i18n }}</span>
+        <span class="tw-sr-only">{{ "loading" | i18n }}</span>
       </div>
       <div class="modal-body" *ngIf="!loading">
         <ng-container *ngIf="!editMode">
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.html
index 928d178c29a..a3e2a180c39 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup-provider.component.html
@@ -7,7 +7,7 @@
         title="{{ 'loading' | i18n }}"
         aria-hidden="true"
       ></i>
-      <span class="sr-only">{{ "loading" | i18n }}</span>
+      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
     </p>
   </div>
 </div>
diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
index 0fd6725304c..3b81d0564c9 100644
--- a/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/admin-console/providers/setup/setup.component.html
@@ -7,7 +7,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <div class="container page-content" *ngIf="!loading">
   <div class="page-header">
diff --git a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
index 45cfc02a095..7a1510ef643 100644
--- a/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
+++ b/bitwarden_license/bit-web/src/app/auth/sso/sso.component.ts
@@ -369,7 +369,7 @@ export class SsoComponent implements OnInit, OnDestroy {
     );
 
     const div = document.createElement("div");
-    div.className = "sr-only";
+    div.className = "tw-sr-only";
     div.id = "srErrorCount";
     div.setAttribute("aria-live", "polite");
     div.innerText = errorText + ": " + errorCountText;
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
index caf07e49734..ea265a04859 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/clients/manage-clients.component.html
@@ -12,7 +12,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 
 <ng-container *ngIf="!loading">
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/payment-method/provider-payment-method.component.html b/bitwarden_license/bit-web/src/app/billing/providers/payment-method/provider-payment-method.component.html
index e2457294eb1..2894752b28f 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/payment-method/provider-payment-method.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/payment-method/provider-payment-method.component.html
@@ -5,7 +5,7 @@
     title="{{ 'loading' | i18n }}"
     aria-hidden="true"
   ></i>
-  <span class="sr-only">{{ "loading" | i18n }}</span>
+  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
 </ng-container>
 <bit-container *ngIf="!loading">
   <!-- Account Credit -->
diff --git a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
index 0aaa3cc03ae..5c8a0985797 100644
--- a/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
+++ b/bitwarden_license/bit-web/src/app/billing/providers/subscription/provider-subscription.component.html
@@ -2,7 +2,7 @@
 <bit-container>
   <ng-container *ngIf="!firstLoaded && loading">
     <i class="bwi bwi-spinner bwi-spin text-muted" title="{{ 'loading' | i18n }}"></i>
-    <span class="sr-only">{{ "loading" | i18n }}</span>
+    <span class="tw-sr-only">{{ "loading" | i18n }}</span>
   </ng-container>
   <ng-container *ngIf="firstLoaded && !loading">
     <app-provider-subscription-status

From 6b6ba8f30e61a21abc46131088327749d24e823e Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Wed, 10 Jul 2024 17:56:01 +0200
Subject: [PATCH 4/6] Hide file inputs

---
 apps/web/src/app/billing/individual/premium.component.html      | 2 +-
 .../app/billing/organizations/organization-plans.component.html | 2 +-
 .../src/app/billing/shared/update-license-dialog.component.html | 2 +-
 apps/web/src/app/billing/shared/update-license.component.html   | 2 +-
 apps/web/src/app/tools/send/add-edit.component.html             | 2 +-
 .../secrets-manager/settings/porting/sm-import.component.html   | 2 +-
 libs/importer/src/components/import.component.html              | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/web/src/app/billing/individual/premium.component.html b/apps/web/src/app/billing/individual/premium.component.html
index e3afa7779b8..324c24efd39 100644
--- a/apps/web/src/app/billing/individual/premium.component.html
+++ b/apps/web/src/app/billing/individual/premium.component.html
@@ -81,7 +81,7 @@ <h2 *ngIf="!selfHosted" bitTypography="h2">{{ "goPremium" | i18n }}</h2>
         type="file"
         formControlName="file"
         (change)="setSelectedFile($event)"
-        hidden
+        class="tw-hidden"
       />
       <bit-hint>{{ "licenseFileDesc" | i18n: "bitwarden_premium_license.json" }}</bit-hint>
     </bit-form-field>
diff --git a/apps/web/src/app/billing/organizations/organization-plans.component.html b/apps/web/src/app/billing/organizations/organization-plans.component.html
index b9a3cc6bf05..1d79306d07e 100644
--- a/apps/web/src/app/billing/organizations/organization-plans.component.html
+++ b/apps/web/src/app/billing/organizations/organization-plans.component.html
@@ -19,12 +19,12 @@
       </div>
       <input
         #fileSelector
-        hidden
         bitInput
         type="file"
         formControlName="file"
         (change)="setSelectedFile($event)"
         accept="application/JSON"
+        class="tw-hidden"
       />
       <bit-hint>{{ "licenseFileDesc" | i18n: "bitwarden_organization_license.json" }}</bit-hint>
     </bit-form-field>
diff --git a/apps/web/src/app/billing/shared/update-license-dialog.component.html b/apps/web/src/app/billing/shared/update-license-dialog.component.html
index 6430c47528f..002a7430e32 100644
--- a/apps/web/src/app/billing/shared/update-license-dialog.component.html
+++ b/apps/web/src/app/billing/shared/update-license-dialog.component.html
@@ -15,7 +15,7 @@
           type="file"
           formControlName="file"
           (change)="setSelectedFile($event)"
-          hidden
+          class="tw-hidden"
         />
         <bit-hint>{{ "licenseFileDesc" | i18n: "bitwarden_premium_license.json" }}</bit-hint>
       </bit-form-field>
diff --git a/apps/web/src/app/billing/shared/update-license.component.html b/apps/web/src/app/billing/shared/update-license.component.html
index 37eaa30c64c..c415c916d03 100644
--- a/apps/web/src/app/billing/shared/update-license.component.html
+++ b/apps/web/src/app/billing/shared/update-license.component.html
@@ -13,7 +13,7 @@
       type="file"
       formControlName="file"
       (change)="setSelectedFile($event)"
-      hidden
+      class="tw-hidden"
     />
     <bit-hint>{{
       "licenseFileDesc"
diff --git a/apps/web/src/app/tools/send/add-edit.component.html b/apps/web/src/app/tools/send/add-edit.component.html
index cc96908eaa9..47959f018c5 100644
--- a/apps/web/src/app/tools/send/add-edit.component.html
+++ b/apps/web/src/app/tools/send/add-edit.component.html
@@ -76,12 +76,12 @@
             <input
               bitInput
               #fileSelector
-              hidden
               type="file"
               id="file"
               name="file"
               formControlName="file"
               (change)="setSelectedFile($event)"
+              class="tw-hidden"
             />
             <bit-hint>{{ "sendFileDesc" | i18n }} {{ "maxFileSize" | i18n }}</bit-hint>
           </bit-form-field>
diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
index 31f16111483..d30f52a1181 100644
--- a/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
+++ b/bitwarden_license/bit-web/src/app/secrets-manager/settings/porting/sm-import.component.html
@@ -11,7 +11,6 @@
     </div>
     <input
       #fileSelector
-      hidden
       bitInput
       type="file"
       id="file"
@@ -19,6 +18,7 @@
       name="file"
       (change)="setSelectedFile($event)"
       accept="application/JSON"
+      class="tw-hidden"
     />
     <bit-hint>{{ "acceptedFormats" | i18n }} Bitwarden (json)</bit-hint>
   </bit-form-field>
diff --git a/libs/importer/src/components/import.component.html b/libs/importer/src/components/import.component.html
index eda999ab47e..b3f14827dd9 100644
--- a/libs/importer/src/components/import.component.html
+++ b/libs/importer/src/components/import.component.html
@@ -381,7 +381,7 @@
         id="import_input_file"
         formControlName="file"
         (change)="setSelectedFile($event)"
-        hidden
+        class="tw-hidden"
       />
     </bit-form-field>
     <bit-form-field>

From a19492b4d7edf79397d3b36c0455d0d496973080 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Thu, 11 Jul 2024 11:08:40 +0200
Subject: [PATCH 5/6] Fix alignment of customize avatar

---
 apps/web/src/app/auth/settings/account/profile.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/app/auth/settings/account/profile.component.html b/apps/web/src/app/auth/settings/account/profile.component.html
index 4464824c63e..93025420b26 100644
--- a/apps/web/src/app/auth/settings/account/profile.component.html
+++ b/apps/web/src/app/auth/settings/account/profile.component.html
@@ -19,8 +19,8 @@
       </bit-form-field>
     </div>
     <div class="tw-col-span-6">
-      <div class="tw-mb-3">
-        <dynamic-avatar text="{{ profile | userName }}" [id]="profile.id" [size]="'large'">
+      <div class="tw-mb-3 tw-flex tw-align-middle tw-items-center">
+        <dynamic-avatar text="{{ profile | userName }}" [id]="profile.id" size="large">
         </dynamic-avatar>
         <button
           class="tw-ml-3"

From 1c1044e0199051664a9840c7e3a634472ed68682 Mon Sep 17 00:00:00 2001
From: Hinton <hinton@users.noreply.github.com>
Date: Fri, 26 Jul 2024 15:17:20 +0200
Subject: [PATCH 6/6] Remove missed file from conflict

---
 .../manage/new-groups.component.html          | 109 ------------------
 1 file changed, 109 deletions(-)
 delete mode 100644 apps/web/src/app/admin-console/organizations/manage/new-groups.component.html

diff --git a/apps/web/src/app/admin-console/organizations/manage/new-groups.component.html b/apps/web/src/app/admin-console/organizations/manage/new-groups.component.html
deleted file mode 100644
index 1254d48cc76..00000000000
--- a/apps/web/src/app/admin-console/organizations/manage/new-groups.component.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<app-header>
-  <bit-search
-    [placeholder]="'searchGroups' | i18n"
-    [formControl]="searchControl"
-    class="tw-w-80"
-  ></bit-search>
-  <button bitButton type="button" buttonType="primary" (click)="add()">
-    <i class="bwi bwi-plus bwi-fw" aria-hidden="true"></i>
-    {{ "newGroup" | i18n }}
-  </button>
-</app-header>
-
-<ng-container *ngIf="loading">
-  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
-    title="{{ 'loading' | i18n }}"
-    aria-hidden="true"
-  ></i>
-  <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-</ng-container>
-<ng-container *ngIf="!loading">
-  <p *ngIf="!dataSource.filteredData.length">{{ "noGroupsInList" | i18n }}</p>
-  <!-- The padding on the bottom of the cdk-virtual-scroll-viewport element is required to prevent table row content
-  from overflowing the <main> element. -->
-  <cdk-virtual-scroll-viewport scrollWindow [itemSize]="rowHeight" class="tw-pb-8">
-    <bit-table *ngIf="dataSource.filteredData.length" [dataSource]="dataSource">
-      <ng-container header>
-        <tr>
-          <th bitCell class="tw-w-20">
-            <input
-              type="checkbox"
-              bitCheckbox
-              class="tw-mr-2"
-              (change)="toggleAllVisible($event)"
-              id="selectAll"
-            />
-            <label class="tw-mb-0 !tw-font-bold !tw-text-muted" for="selectAll">{{
-              "all" | i18n
-            }}</label>
-          </th>
-          <th bitCell bitSortable="name" default>{{ "name" | i18n }}</th>
-          <th bitCell>{{ "collections" | i18n }}</th>
-          <th bitCell class="tw-w-10">
-            <button
-              [bitMenuTriggerFor]="headerMenu"
-              type="button"
-              bitIconButton="bwi-ellipsis-v"
-              size="small"
-              appA11yTitle="{{ 'options' | i18n }}"
-            ></button>
-
-            <bit-menu #headerMenu>
-              <button type="button" bitMenuItem (click)="deleteAllSelected()">
-                <span class="tw-text-danger"
-                  ><i aria-hidden="true" class="bwi bwi-trash"></i> {{ "delete" | i18n }}</span
-                >
-              </button>
-            </bit-menu>
-          </th>
-        </tr>
-      </ng-container>
-      <ng-template body let-rows$>
-        <tr bitRow *cdkVirtualFor="let g of rows$" [ngClass]="rowHeightClass">
-          <td bitCell (click)="check(g)" class="tw-cursor-pointer">
-            <input type="checkbox" bitCheckbox [(ngModel)]="g.checked" />
-          </td>
-          <td bitCell class="tw-cursor-pointer tw-font-bold" (click)="edit(g)">
-            <button type="button" bitLink>
-              {{ g.details.name }}
-            </button>
-          </td>
-          <td bitCell (click)="edit(g, ModalTabType.Collections)" class="tw-cursor-pointer">
-            <bit-badge-list
-              [items]="g.collectionNames"
-              [maxItems]="3"
-              variant="secondary"
-            ></bit-badge-list>
-          </td>
-          <td bitCell>
-            <button
-              [bitMenuTriggerFor]="rowMenu"
-              type="button"
-              bitIconButton="bwi-ellipsis-v"
-              size="small"
-              appA11yTitle="{{ 'options' | i18n }}"
-            ></button>
-
-            <bit-menu #rowMenu>
-              <button type="button" bitMenuItem (click)="edit(g)">
-                <i aria-hidden="true" class="bwi bwi-pencil-square"></i> {{ "editInfo" | i18n }}
-              </button>
-              <button type="button" bitMenuItem (click)="edit(g, ModalTabType.Members)">
-                <i aria-hidden="true" class="bwi bwi-user"></i> {{ "members" | i18n }}
-              </button>
-              <button type="button" bitMenuItem (click)="edit(g, ModalTabType.Collections)">
-                <i aria-hidden="true" class="bwi bwi-collection"></i> {{ "collections" | i18n }}
-              </button>
-              <button type="button" bitMenuItem (click)="delete(g)">
-                <span class="tw-text-danger"
-                  ><i aria-hidden="true" class="bwi bwi-trash"></i> {{ "delete" | i18n }}</span
-                >
-              </button>
-            </bit-menu>
-          </td>
-        </tr>
-      </ng-template>
-    </bit-table>
-  </cdk-virtual-scroll-viewport>
-</ng-container>