From 868d235faab17f3f3fb636fa7a36cefdfdc26fe9 Mon Sep 17 00:00:00 2001
From: Vincent Salucci <26154748+vincentsalucci@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:20:31 -0600
Subject: [PATCH] [Icons] FF - requested icon changes (#1435)

* [Icons] Removed FA

* Icon changes // Webpack correction // Padding updates
---
 package-lock.json                                | 14 --------------
 package.json                                     |  1 -
 src/app/organizations/vault/vault.component.html |  2 +-
 src/app/send/send.component.html                 |  4 ++--
 src/app/vault/add-edit.component.html            |  4 ++--
 src/app/vault/bulk-actions.component.html        |  2 +-
 src/app/vault/ciphers.component.html             |  2 +-
 src/app/vault/groupings.component.html           | 10 +++++-----
 src/app/vault/vault.component.html               |  2 +-
 webpack.config.js                                |  2 +-
 10 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fdc32008..f8b8539d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,6 @@
         "browser-hrtime": "^1.1.8",
         "core-js": "^3.11.0",
         "date-input-polyfill": "^2.14.0",
-        "font-awesome": "4.7.0",
         "jquery": "3.6.0",
         "ngx-infinite-scroll": "^10.0.1",
         "ngx-toastr": "14.1.4",
@@ -3251,14 +3250,6 @@
         }
       }
     },
-    "node_modules/font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
     "node_modules/foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
@@ -10260,11 +10251,6 @@
       "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==",
       "dev": true
     },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
-    },
     "foreach": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
diff --git a/package.json b/package.json
index 8321b2ec..8711bafc 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,6 @@
     "browser-hrtime": "^1.1.8",
     "core-js": "^3.11.0",
     "date-input-polyfill": "^2.14.0",
-    "font-awesome": "4.7.0",
     "jquery": "3.6.0",
     "ngx-infinite-scroll": "^10.0.1",
     "ngx-toastr": "14.1.4",
diff --git a/src/app/organizations/vault/vault.component.html b/src/app/organizations/vault/vault.component.html
index 3362a205..8f5aee06 100644
--- a/src/app/organizations/vault/vault.component.html
+++ b/src/app/organizations/vault/vault.component.html
@@ -37,7 +37,7 @@
           </app-vault-bulk-actions>
           <button
             type="button"
-            class="btn btn-outline-primary btn-sm ml-auto"
+            class="btn btn-outline-primary btn-sm ml-3"
             (click)="addCipher()"
             *ngIf="!deleted"
           >
diff --git a/src/app/send/send.component.html b/src/app/send/send.component.html
index a27f7d02..a3a2919b 100644
--- a/src/app/send/send.component.html
+++ b/src/app/send/send.component.html
@@ -60,7 +60,7 @@
         <div class="ml-auto d-flex">
           <button
             type="button"
-            class="btn btn-outline-primary btn-sm"
+            class="btn btn-outline-primary btn-sm ml-3"
             (click)="addSend()"
             [disabled]="disableSend"
           >
@@ -177,7 +177,7 @@
         </ng-container>
         <ng-container *ngIf="loaded">
           <p>{{ "noSendsInList" | i18n }}</p>
-          <button (click)="addSend()" class="btn btn-outline-primary" [disabled]="disableSend">
+          <button (click)="addSend()" class="btn btn-outline-primary ml-3" [disabled]="disableSend">
             <i class="bwi bwi-plus bwi-fw"></i>{{ "createSend" | i18n }}
           </button>
         </ng-container>
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index 4c5f6d3d..1edbeffe 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -103,7 +103,7 @@
                     (click)="generatePassword()"
                     *ngIf="cipher.viewPassword"
                   >
-                    <i class="bwi bwi-lg bwi-fw bwi-refresh" aria-hidden="true"></i>
+                    <i class="bwi bwi-lg bwi-fw bwi-generate" aria-hidden="true"></i>
                   </a>
                   <a
                     href="#"
@@ -268,7 +268,7 @@
                       (click)="launch(u)"
                       [disabled]="!u.canLaunch"
                     >
-                      <i class="bwi bwi-lg bwi-share" aria-hidden="true"></i>
+                      <i class="bwi bwi-lg bwi-share-square" aria-hidden="true"></i>
                     </button>
                     <button
                       type="button"
diff --git a/src/app/vault/bulk-actions.component.html b/src/app/vault/bulk-actions.component.html
index 7de4b16a..fafcefde 100644
--- a/src/app/vault/bulk-actions.component.html
+++ b/src/app/vault/bulk-actions.component.html
@@ -17,7 +17,7 @@
       (click)="bulkMove()"
       *ngIf="!deleted && !organization"
     >
-      <i class="bwi bwi-fw bwi-share" aria-hidden="true"></i>
+      <i class="bwi bwi-fw bwi-folder" aria-hidden="true"></i>
       {{ "moveSelected" | i18n }}
     </button>
     <button
diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index f36366b5..90d816df 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -184,7 +184,7 @@
     </ng-container>
     <ng-container *ngIf="loaded">
       <p>{{ "noItemsInList" | i18n }}</p>
-      <button (click)="addCipher()" class="btn btn-outline-primary" *ngIf="showAddNew">
+      <button (click)="addCipher()" class="btn btn-outline-primary ml-3" *ngIf="showAddNew">
         <i class="bwi bwi-plus bwi-fw"></i>{{ "addItem" | i18n }}
       </button>
     </ng-container>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index d8dc6ef7..6bfdb35b 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -30,7 +30,7 @@
       </li>
       <li [ngClass]="{ active: selectedFavorites }" *ngIf="showFavorites">
         <a href="#" appStopClick (click)="selectFavorites()">
-          <i class="bwi bwi-li bwi-fw bwi-star-f"></i>{{ "favorites" | i18n }}
+          <i class="bwi bwi-li bwi-fw bwi-star"></i>{{ "favorites" | i18n }}
         </a>
       </li>
       <li [ngClass]="{ active: selectedTrash }" *ngIf="showTrash">
@@ -92,8 +92,8 @@
                   class="bwi-li bwi"
                   title="{{ 'toggleCollapse' | i18n }}"
                   [ngClass]="{
-                    'bwi-caret-right': isCollapsed(f.node),
-                    'bwi-caret-down': !isCollapsed(f.node)
+                    'bwi-angle-right': isCollapsed(f.node),
+                    'bwi-angle-down': !isCollapsed(f.node)
                   }"
                   (click)="collapse(f.node)"
                 ></i>
@@ -141,8 +141,8 @@
                 class="bwi-li bwi"
                 title="{{ 'toggleCollapse' | i18n }}"
                 [ngClass]="{
-                  'bwi-caret-right': isCollapsed(c.node),
-                  'bwi-caret-down': !isCollapsed(c.node)
+                  'bwi-angle-right': isCollapsed(c.node),
+                  'bwi-angle-down': !isCollapsed(c.node)
                 }"
                 (click)="collapse(c.node)"
               ></i>
diff --git a/src/app/vault/vault.component.html b/src/app/vault/vault.component.html
index bf86bd45..069a2f36 100644
--- a/src/app/vault/vault.component.html
+++ b/src/app/vault/vault.component.html
@@ -34,7 +34,7 @@
           </app-vault-bulk-actions>
           <button
             type="button"
-            class="btn btn-outline-primary btn-sm"
+            class="btn btn-outline-primary btn-sm ml-3"
             (click)="addCipher()"
             *ngIf="!deleted"
           >
diff --git a/webpack.config.js b/webpack.config.js
index ab7382b7..b680744a 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -37,7 +37,7 @@ const moduleRules = [
   },
   {
     test: /\.(jpe?g|png|gif|svg|webp|avif)$/i,
-    exclude: /.*(fontawesome-webfont)\.svg/,
+    exclude: /.*(bwi-font)\.svg/,
     generator: {
       filename: "images/[name][ext]",
     },