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

* [Icons] Remove FA

* Icon changes // webpack correction
---
 package-lock.json                      | 16 ----------------
 package.json                           |  1 -
 src/app/vault/add-edit.component.html  |  2 +-
 src/app/vault/groupings.component.html | 10 +++++-----
 webpack.renderer.js                    |  2 +-
 5 files changed, 7 insertions(+), 24 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5588e625da..09d5aa14d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -43,7 +43,6 @@
         "electron-notarize": "^1.1.1",
         "electron-rebuild": "^3.2.5",
         "electron-reload": "^1.5.0",
-        "font-awesome": "4.7.0",
         "html-loader": "^3.0.1",
         "html-webpack-plugin": "^5.5.0",
         "husky": "^7.0.4",
@@ -4382,15 +4381,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.3"
-      }
-    },
     "node_modules/forcefocus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/forcefocus/-/forcefocus-1.1.0.tgz",
@@ -13406,12 +13396,6 @@
         "path-exists": "^4.0.0"
       }
     },
-    "font-awesome": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
-      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
-      "dev": true
-    },
     "forcefocus": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/forcefocus/-/forcefocus-1.1.0.tgz",
diff --git a/package.json b/package.json
index ccad4500a5..47a65d4677 100644
--- a/package.json
+++ b/package.json
@@ -266,7 +266,6 @@
     "electron-notarize": "^1.1.1",
     "electron-rebuild": "^3.2.5",
     "electron-reload": "^1.5.0",
-    "font-awesome": "4.7.0",
     "html-loader": "^3.0.1",
     "html-webpack-plugin": "^5.5.0",
     "husky": "^7.0.4",
diff --git a/src/app/vault/add-edit.component.html b/src/app/vault/add-edit.component.html
index b8ccb08f41..0c923a32a7 100644
--- a/src/app/vault/add-edit.component.html
+++ b/src/app/vault/add-edit.component.html
@@ -426,7 +426,7 @@
                   appA11yTitle="{{ 'toggleOptions' | i18n }}"
                   (click)="toggleUriOptions(u)"
                 >
-                  <i class="bwi bwi-lg bwi-cog-f" aria-hidden="true"></i>
+                  <i class="bwi bwi-lg bwi-cog" aria-hidden="true"></i>
                 </a>
               </div>
             </div>
diff --git a/src/app/vault/groupings.component.html b/src/app/vault/groupings.component.html
index 00b9e62cee..276c7f5718 100644
--- a/src/app/vault/groupings.component.html
+++ b/src/app/vault/groupings.component.html
@@ -9,7 +9,7 @@
       </li>
       <li [ngClass]="{ active: selectedFavorites }">
         <a href="#" appStopClick appBlurClick (click)="selectFavorites()">
-          <i class="bwi bwi-fw bwi-star-f" aria-hidden="true"></i>&nbsp;{{ "favorites" | i18n }}
+          <i class="bwi bwi-fw bwi-star" aria-hidden="true"></i>&nbsp;{{ "favorites" | i18n }}
         </a>
       </li>
       <li [ngClass]="{ active: selectedTrash }">
@@ -64,8 +64,8 @@
                 title="{{ 'toggleCollapse' | i18n }}"
                 aria-hidden="true"
                 [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)"
                 appStopProp
@@ -114,8 +114,8 @@
                   title="{{ 'toggleCollapse' | i18n }}"
                   aria-hidden="true"
                   [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)"
                   appStopProp
diff --git a/webpack.renderer.js b/webpack.renderer.js
index 9878d1a9fb..0a4623fc2d 100644
--- a/webpack.renderer.js
+++ b/webpack.renderer.js
@@ -19,7 +19,7 @@ const common = {
       },
       {
         test: /\.(jpe?g|png|gif|svg)$/i,
-        exclude: /.*(fontawesome-webfont)\.svg/,
+        exclude: /.*(bwi-font)\.svg/,
         generator: {
           filename: "images/[name][ext]",
         },