diff --git a/angular/src/components/callout.component.html b/angular/src/components/callout.component.html
index dbd19df81b..0fadc19aa3 100644
--- a/angular/src/components/callout.component.html
+++ b/angular/src/components/callout.component.html
@@ -5,7 +5,7 @@
[attr.role]="useAlertRole ? 'alert' : null"
>
diff --git a/angular/src/components/callout.component.ts b/angular/src/components/callout.component.ts
index 98105e825c..b9685f0ea3 100644
--- a/angular/src/components/callout.component.ts
+++ b/angular/src/components/callout.component.ts
@@ -36,7 +36,7 @@ export class CalloutComponent implements OnInit {
this.title = this.i18nService.t("warning");
}
if (this.icon === undefined) {
- this.icon = "fa-warning";
+ this.icon = "bwi-exclamation-triangle";
}
} else if (this.type === "error") {
this.calloutStyle = "danger";
@@ -44,7 +44,7 @@ export class CalloutComponent implements OnInit {
this.title = this.i18nService.t("error");
}
if (this.icon === undefined) {
- this.icon = "fa-bolt";
+ this.icon = "bwi-error";
}
} else if (this.type === "tip") {
this.calloutStyle = "success";
@@ -52,7 +52,7 @@ export class CalloutComponent implements OnInit {
this.title = this.i18nService.t("tip");
}
if (this.icon === undefined) {
- this.icon = "fa-lightbulb-o";
+ this.icon = "bwi-lightbulb";
}
}
}
diff --git a/angular/src/components/icon.component.html b/angular/src/components/icon.component.html
index 878a0ee949..fdfb3a5883 100644
--- a/angular/src/components/icon.component.html
+++ b/angular/src/components/icon.component.html
@@ -1,4 +1,4 @@
-
+
diff --git a/angular/src/components/icon.component.ts b/angular/src/components/icon.component.ts
index d30ce20e8c..ca1f2555fa 100644
--- a/angular/src/components/icon.component.ts
+++ b/angular/src/components/icon.component.ts
@@ -9,15 +9,6 @@ import { StateService } from "jslib-common/abstractions/state.service";
import { Utils } from "jslib-common/misc/utils";
-const IconMap: any = {
- "fa-globe": String.fromCharCode(0xf0ac),
- "fa-sticky-note-o": String.fromCharCode(0xf24a),
- "fa-id-card-o": String.fromCharCode(0xf2c3),
- "fa-credit-card": String.fromCharCode(0xf09d),
- "fa-android": String.fromCharCode(0xf17b),
- "fa-apple": String.fromCharCode(0xf179),
-};
-
/**
* Provides a mapping from supported card brands to
* the filenames of icon that should be present in images/cards folder of clients.
@@ -59,25 +50,21 @@ export class IconComponent implements OnChanges {
this.load();
}
- get iconCode(): string {
- return IconMap[this.icon];
- }
-
protected load() {
switch (this.cipher.type) {
case CipherType.Login:
- this.icon = "fa-globe";
+ this.icon = "bwi-globe";
this.setLoginIcon();
break;
case CipherType.SecureNote:
- this.icon = "fa-sticky-note-o";
+ this.icon = "bwi-sticky-note";
break;
case CipherType.Card:
- this.icon = "fa-credit-card";
+ this.icon = "bwi-credit-card";
this.setCardIcon();
break;
case CipherType.Identity:
- this.icon = "fa-id-card-o";
+ this.icon = "bwi-id-card";
break;
default:
break;
@@ -90,10 +77,10 @@ export class IconComponent implements OnChanges {
let isWebsite = false;
if (hostnameUri.indexOf("androidapp://") === 0) {
- this.icon = "fa-android";
+ this.icon = "bwi-android";
this.image = null;
} else if (hostnameUri.indexOf("iosapp://") === 0) {
- this.icon = "fa-apple";
+ this.icon = "bwi-apple";
this.image = null;
} else if (
this.imageEnabled &&
diff --git a/angular/src/components/verify-master-password.component.html b/angular/src/components/verify-master-password.component.html
index 19330ff636..71793ad6f1 100644
--- a/angular/src/components/verify-master-password.component.html
+++ b/angular/src/components/verify-master-password.component.html
@@ -24,7 +24,7 @@
{{ "sendCode" | i18n }}
-
+
{{ "codeSent" | i18n }}
diff --git a/angular/src/scss/bwicons/fonts/bwi-font.svg b/angular/src/scss/bwicons/fonts/bwi-font.svg
new file mode 100644
index 0000000000..4584939d03
--- /dev/null
+++ b/angular/src/scss/bwicons/fonts/bwi-font.svg
@@ -0,0 +1,169 @@
+
+
+