From 2e09265d3addfbb6f09ed917a8e9175995ac7067 Mon Sep 17 00:00:00 2001
From: Addison Beck <addisonbeck1@gmail.com>
Date: Mon, 14 Feb 2022 15:43:05 -0500
Subject: [PATCH] [bug] Fix tab order regression (#1340)

---
 jslib                              |  2 +-
 src/app/vault/vault.component.html | 26 +++++++++++++-------------
 src/scss/vault.scss                | 13 +++++++++++++
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/jslib b/jslib
index 609baece05a..240fc154ab0 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 609baece05a046f6679989e55f6e029dd57fb9ee
+Subproject commit 240fc154ab00a57829d0ce1398a6a6ce93395070
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index 3d17edf071e..2b1df2f5880 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -1,17 +1,4 @@
 <div id="vault" class="vault" attr.aria-hidden="{{ showingModal }}">
-  <app-vault-groupings
-    id="groupings"
-    class="groupings"
-    (onAllClicked)="clearGroupingFilters()"
-    (onFavoritesClicked)="filterFavorites()"
-    (onCipherTypeClicked)="filterCipherType($event)"
-    (onFolderClicked)="filterFolder($event.id)"
-    (onAddFolder)="addFolder()"
-    (onEditFolder)="editFolder($event.id)"
-    (onCollectionClicked)="filterCollection($event.id)"
-    (onTrashClicked)="filterDeleted()"
-  >
-  </app-vault-groupings>
   <app-vault-ciphers
     id="items"
     class="items"
@@ -64,6 +51,19 @@
       </div>
     </div>
   </div>
+  <app-vault-groupings
+    id="groupings"
+    class="groupings"
+    (onAllClicked)="clearGroupingFilters()"
+    (onFavoritesClicked)="filterFavorites()"
+    (onCipherTypeClicked)="filterCipherType($event)"
+    (onFolderClicked)="filterFolder($event.id)"
+    (onAddFolder)="addFolder()"
+    (onEditFolder)="editFolder($event.id)"
+    (onCollectionClicked)="filterCollection($event.id)"
+    (onTrashClicked)="filterDeleted()"
+  >
+  </app-vault-groupings>
 </div>
 <ng-template #passwordGenerator></ng-template>
 <ng-template #attachments></ng-template>
diff --git a/src/scss/vault.scss b/src/scss/vault.scss
index e4ffbe3571e..168a23e9b03 100644
--- a/src/scss/vault.scss
+++ b/src/scss/vault.scss
@@ -27,7 +27,20 @@ app-root {
     }
   }
 
+  > .items {
+    order: 2;
+  }
+
+  > .details {
+    order: 3;
+  }
+
+  > .logo {
+    order: 4;
+  }
+
   > .groupings {
+    order: 1;
     width: 22%;
     min-width: 175px;
     max-width: 250px;